openstack/kolla
Code Issues Proposed changes

opensearch: drop unnecessary workarounds

Browse Source 
Change-Id: Id6db7ffb22b3f63e9a406455d52078b76071672f
This commit is contained in:
Michal Nasiadka 2023-06-20 15:20:38 +02:00 committed by Bartosz Bezak
parent f89cb612e0
commit b33167972d
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/opensearch/opensearch-dashboards/Dockerfile.j2
View File

@ -12,17 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set opensearch_dashboards_packages = ['opensearch-dashboards'] %} {% set opensearch_dashboards_packages = ['opensearch-dashboards'] %}
{% if base_package_type == 'rpm' %} {{ macros.install_packages(opensearch_dashboards_packages | customizable("packages")) }}
{# 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
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start

11
docker/opensearch/opensearch/Dockerfile.j2
View File

@ -14,16 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'opensearch' 'opensearch'
] %} ] %}
{% if base_package_type == 'rpm' %} {{ macros.install_packages(opensearch_packages | customizable("packages")) }}
{# 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 COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start