opensearch: move to yum/apt repos

systemd-tmpfiles is needed otherwise opensearch
postinst on Debian/Ubuntu fails

Change-Id: I5aeb5796f8de7697a1c4a7404fe292ef9eb522ee
(cherry picked from commit 6bd7898a1d95157c713bdff0fe5bdf5a59b65550)

2 files changed, 28 insertions, 35 deletions

diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2
index 030ae925d..60693ebc0 100644
--- a/docker/opensearch/opensearch-dashboards/Dockerfile.j2
+++ b/docker/opensearch/opensearch-dashboards/Dockerfile.j2
@@ -8,25 +8,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {{ macros.configure_user(name='opensearch', shell='/bin/bash', homedir='/usr/share/opensearch') }}
+{{ macros.enable_extra_repos(['opensearch-dashboards']) }}
 
-{% block opensearch_version %}
+{% set opensearch_dashboards_packages = ['opensearch-dashboards'] %}
 
-    {% if base_arch == 'x86_64' %}
-        {% set arch_os='x64' %}
-    {% elif base_arch == 'aarch64' %}
-        {% set arch_os='arm64' %}
-    {% endif %}
+{% if base_package_type == 'rpm' %}
+{# TODO: OpenSearch will move from SHA1 in 2.8 release, remove this once 2.8 is out #}
+RUN update-crypto-policies --set DEFAULT:SHA1
+{% endif %}
 
-ARG opensearch_version=2.3.0
-ARG opensearch_dashboards_url=https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/${opensearch_version}/opensearch-dashboards-${opensearch_version}-linux-{{ arch_os }}.tar.gz
-{% endblock %}
-
-ARG OPENSEARCH_DASHBOARDS_HOME=/usr/share/opensearch-dashboards
-
-RUN mkdir -p $OPENSEARCH_DASHBOARDS_HOME && \
-    curl -o /tmp/opensearch-dashboards.tgz ${opensearch_dashboards_url} && \
-    tar -xzpf /tmp/opensearch-dashboards.tgz -C $OPENSEARCH_DASHBOARDS_HOME --strip-components=1 && \
-    rm /tmp/opensearch-dashboards.tgz
+{# TODO: ugly hack to get past opensearch postinst, remove once #}
+{# https://github.com/opensearch-project/opensearch-build/pull/3435 gets merged #}
+{# and packages get rebuilt #}
+RUN touch /usr/bin/systemd-tmpfiles && chmod a+rx /usr/bin/systemd-tmpfiles \
+    && {{ macros.install_packages(opensearch_dashboards_packages | customizable("packages"), chain=True) }} \
+    && rm -f /usr/bin/systemd-tmpfiles
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
diff --git a/docker/opensearch/opensearch/Dockerfile.j2 b/docker/opensearch/opensearch/Dockerfile.j2
index 4b3f949af..587f86d65 100644
--- a/docker/opensearch/opensearch/Dockerfile.j2
+++ b/docker/opensearch/opensearch/Dockerfile.j2
@@ -8,25 +8,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {{ macros.configure_user(name='opensearch', shell='/bin/bash', homedir='/usr/share/opensearch') }}
-
-{% block opensearch_version %}
-
-    {% if base_arch == 'x86_64' %}
-        {% set arch_os='x64' %}
-    {% elif base_arch == 'aarch64' %}
-        {% set arch_os='arm64' %}
-    {% endif %}
-
-ARG opensearch_version=2.3.0
-ARG opensearch_url=https://artifacts.opensearch.org/releases/bundle/opensearch/${opensearch_version}/opensearch-${opensearch_version}-linux-{{ arch_os }}.tar.gz
-{% endblock %}
-
-ARG OPENSEARCH_HOME=/usr/share/opensearch
-
-RUN curl -o /tmp/opensearch.tgz ${opensearch_url} && \
-    tar -xzpf /tmp/opensearch.tgz -C $OPENSEARCH_HOME --strip-components=1 && \
-    rm /tmp/opensearch.tgz && \
-    mkdir -p $OPENSEARCH_HOME/data && chown -R opensearch:opensearch $OPENSEARCH_HOME/data
+{{ macros.enable_extra_repos(['opensearch']) }}
+
+    {% set opensearch_packages = [
+        'opensearch'
+    ] %}
+
+{% if base_package_type == 'rpm' %}
+{# TODO: OpenSearch will move from SHA1 in 2.8 release, remove this when 2.8 is out #}
+RUN update-crypto-policies --set DEFAULT:SHA1
+{% endif %}
+
+{# TODO: ugly hack to get past opensearch postinst, remove once #}
+{# https://github.com/opensearch-project/opensearch-build/pull/3435 gets merged #}
+{# and packages get rebuilt #}
+RUN touch /usr/bin/systemd-tmpfiles && chmod a+rx /usr/bin/systemd-tmpfiles \
+    && {{ macros.install_packages(opensearch_packages | customizable("packages"), chain=True) }}
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start