Merge pull request #396 from stackhpc/upstream/2024.1-2025-03-31

Synchronise 2024.1 with upstream

Author: priteau

docker/opensearch/opensearch-dashboards/Dockerfile.j2

@@ -12,9 +12,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% set opensearch_dashboards_packages = ['opensearch-dashboards'] %}
 
-{{ macros.install_packages(opensearch_dashboards_packages | customizable("packages")) }}
-
-RUN chown -R opensearch-dashboards:opensearch-dashboards /usr/share/opensearch-dashboards
+{{ macros.install_packages(opensearch_dashboards_packages | customizable("packages")) }} \
+    && chown -R opensearch-dashboards:opensearch-dashboards /usr/share/opensearch-dashboards
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start

docker/opensearch/opensearch/Dockerfile.j2

@@ -16,9 +16,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 ENV OPENSEARCH_INITIAL_ADMIN_PASSWORD="Kolla24OpenSearch"
 
-{{ macros.install_packages(opensearch_packages | customizable("packages")) }}
-
-RUN chown -R opensearch:opensearch /usr/share/opensearch
+{{ macros.install_packages(opensearch_packages | customizable("packages")) }} \
+    && chown -R opensearch:opensearch /usr/share/opensearch
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start