From 610eef2089c186c6e698bb1781501ee8c696f7d5 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 24 Apr 2026 19:25:00 +0200 Subject: Drop apache installation outside of httpd container Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/986483 Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/986352 Change-Id: Ia66dde09bbbad2a5a9e67a8c642f3223ca38be43 Signed-off-by: Michal Nasiadka --- docker/httpd/Dockerfile.j2 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'docker/httpd/Dockerfile.j2') diff --git a/docker/httpd/Dockerfile.j2 b/docker/httpd/Dockerfile.j2 index a41465661..03b4e688b 100644 --- a/docker/httpd/Dockerfile.j2 +++ b/docker/httpd/Dockerfile.j2 @@ -36,9 +36,8 @@ RUN echo > /etc/apache2/ports.conf {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 644 /usr/local/bin/kolla_extend_start - +COPY httpd_setup.sh /usr/local/bin/kolla_httpd_setup +RUN chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_httpd_setup USER root {% block apache_footer %}{% endblock %} - -- cgit v1.2.3