diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2023-06-20 15:20:38 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-06-23 16:00:53 +0000 |
| commit | 530490a7153b8189b24e4cb8f3acb96a5f40d1c1 (patch) | |
| tree | 7a2616b95a1629632d3ee34c80a2c31d36a5a53c | |
| parent | ee8c40c860b15977037e2fd79c5ceeeb2afe9a74 (diff) | |
| download | kolla-530490a7153b8189b24e4cb8f3acb96a5f40d1c1.tar.gz kolla-530490a7153b8189b24e4cb8f3acb96a5f40d1c1.zip | |
opensearch: drop unnecessary workarounds
Change-Id: Id6db7ffb22b3f63e9a406455d52078b76071672f
(cherry picked from commit b33167972d6e17b2eaab85e72043e3b4efa4b789)
| -rw-r--r-- | docker/opensearch/opensearch-dashboards/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | 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 |