aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2026-04-24 19:25:00 +0200
committerMichal Nasiadka <mnasiadka@gmail.com>2026-05-06 07:00:42 +0000
commit610eef2089c186c6e698bb1781501ee8c696f7d5 (patch)
tree9adad05e1544ef7dceaf056bd5dbb97c39765952 /docker/base/Dockerfile.j2
parent33c0e26e8a0290f0b6d647bb67e18a4f500907fc (diff)
downloadkolla-610eef2089c186c6e698bb1781501ee8c696f7d5.tar.gz
kolla-610eef2089c186c6e698bb1781501ee8c696f7d5.zip
Drop apache installation outside of httpd container22.0.0.0rc1
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 <mnasiadka@gmail.com>
Diffstat (limited to 'docker/base/Dockerfile.j2')
-rw-r--r--docker/base/Dockerfile.j23
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index c137011f6..46d8222c6 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -304,7 +304,6 @@ COPY set_configs.py /usr/local/bin/kolla_set_configs
COPY start.sh /usr/local/bin/kolla_start
COPY copy_cacerts.sh /usr/local/bin/kolla_copy_cacerts
COPY install_projects.sh /usr/local/bin/kolla_install_projects
-COPY httpd_setup.sh /usr/local/bin/kolla_httpd_setup
COPY kolla_patch.sh /usr/local/bin/kolla_patch
COPY sudoers /etc/sudoers
@@ -327,7 +326,7 @@ RUN touch /usr/local/bin/kolla_extend_start \
/usr/local/bin/kolla_copy_cacerts \
/usr/local/bin/kolla_install_projects \
/usr/local/bin/kolla_patch \
- && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_httpd_setup \
+ && chmod 644 /usr/local/bin/kolla_extend_start \
&& chmod 440 /etc/sudoers \
&& mkdir -p /var/log/kolla \
&& chown :kolla /var/log/kolla \