diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-28 13:56:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-28 13:56:52 +0000 |
| commit | 801afbf173b1502261a937aca9866f8eb2679fb6 (patch) | |
| tree | 6fe6d74200b2108bda79d1db05dbb09bf02a3707 /docker | |
| parent | a068763b522e59805d86e2b6bb760fff97cd428c (diff) | |
| parent | cc2f0462e751ba237af59d7f6c4db4d7b4dfa9b5 (diff) | |
| download | kolla-801afbf173b1502261a937aca9866f8eb2679fb6.tar.gz kolla-801afbf173b1502261a937aca9866f8eb2679fb6.zip | |
Merge "Prevent apache from listening on port 80 for heat-base"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/heat/heat-base/Dockerfile.j2 | 12 |
1 files 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 |