diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2026-04-24 19:25:00 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-05-06 07:00:42 +0000 |
| commit | 610eef2089c186c6e698bb1781501ee8c696f7d5 (patch) | |
| tree | 9adad05e1544ef7dceaf056bd5dbb97c39765952 /docker/openstack-base | |
| parent | 33c0e26e8a0290f0b6d647bb67e18a4f500907fc (diff) | |
| download | kolla-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/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index eaa010396..6c53fe587 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -37,7 +37,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} {% set openstack_base_packages = [ - 'apache2', 'build-essential', 'ca-certificates', 'git', @@ -209,13 +208,6 @@ ENV PATH /var/lib/kolla/venv/bin:$PATH RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \ && {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }} -{% if base_package_type == 'rpm' %} -RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ - && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf -{% elif base_package_type == 'deb' %} -RUN echo > /etc/apache2/ports.conf -{% endif %} - {{ macros.kolla_patch_sources() }} {% block openstack_base_footer %}{% endblock %} |