From b33167972d6e17b2eaab85e72043e3b4efa4b789 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 20 Jun 2023 15:20:38 +0200 Subject: opensearch: drop unnecessary workarounds Change-Id: Id6db7ffb22b3f63e9a406455d52078b76071672f --- docker/opensearch/opensearch-dashboards/Dockerfile.j2 | 12 +----------- docker/opensearch/opensearch/Dockerfile.j2 | 11 +---------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 index c4abf92f3..83677474a 100644 --- a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 +++ b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 @@ -12,17 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set opensearch_dashboards_packages = ['opensearch-dashboards'] %} -{% 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 %} - -{# 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 +{{ macros.install_packages(opensearch_dashboards_packages | customizable("packages")) }} 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 587f86d65..d9add658d 100644 --- a/docker/opensearch/opensearch/Dockerfile.j2 +++ b/docker/opensearch/opensearch/Dockerfile.j2 @@ -14,16 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build '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) }} +{{ macros.install_packages(opensearch_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start -- cgit v1.2.3