From cc2f0462e751ba237af59d7f6c4db4d7b4dfa9b5 Mon Sep 17 00:00:00 2001 From: Martin André Date: Thu, 23 Mar 2017 09:51:48 +0100 Subject: Prevent apache from listening on port 80 for heat-base A recent change added httpd to heat-base image without preventing it to listen to port 80 like it is done for other images. Co-Authored-By: Juan Antonio Osorio Robles Change-Id: I52573c804bfdf729ef994012abb9d7e4c277585d Closes-Bug: #1675308 --- docker/heat/heat-base/Dockerfile.j2 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 5e7e76a1c..49ec781ce 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -15,14 +15,17 @@ MAINTAINER {{ maintainer }} 'httpd', 'mod_wsgi' ] %} +{{ macros.install_packages(heat_base_packages | customizable("packages")) }} +RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf {% elif base_distro in ['ubuntu'] %} {% set heat_base_packages = [ 'heat-common', 'apache2', 'libapache2-mod-wsgi', ] %} -{% endif %} {{ macros.install_packages(heat_base_packages | customizable("packages")) }} +RUN echo > /etc/apache2/ports.conf +{% endif %} {% elif install_type == 'source' %} @@ -33,6 +36,9 @@ MAINTAINER {{ maintainer }} 'mod_wsgi' ] %} +{{ macros.install_packages(heat_base_packages | customizable("packages")) }} +RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf + {% elif base_distro in ['ubuntu'] %} {% set heat_base_packages = [ @@ -40,9 +46,9 @@ MAINTAINER {{ maintainer }} 'libapache2-mod-wsgi' ] %} -{% endif %} - {{ macros.install_packages(heat_base_packages | customizable("packages")) }} +RUN echo > /etc/apache2/ports.conf +{% endif %} ADD heat-base-archive /heat-base-source -- cgit v1.2.3