diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-27 07:54:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-27 07:54:09 +0000 |
| commit | 464ca08bfee416e5ccc05e3827aecc9ff9f4956d (patch) | |
| tree | ad42538d1d8318928f08a881de9aee5e4d082ea0 /docker/cinder/cinder-api | |
| parent | 13ec42e2a93be480a0aba75fbd8b12d3e9ed027a (diff) | |
| parent | f88ca0f862da4b040b9e0aaac7ac1b952bd0c08b (diff) | |
| download | kolla-464ca08bfee416e5ccc05e3827aecc9ff9f4956d.tar.gz kolla-464ca08bfee416e5ccc05e3827aecc9ff9f4956d.zip | |
Merge "Prevent apache from listening on port 80"
Diffstat (limited to 'docker/cinder/cinder-api')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index ac2860c89..6c6800fba 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -12,14 +12,17 @@ MAINTAINER {{ maintainer }} 'httpd', 'mod_wsgi' ] %} +{{ macros.install_packages(cinder_api_packages | customizable("packages")) }} +RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf {% elif base_distro in ['ubuntu'] %} {% set cinder_api_packages = [ 'cinder-api', 'apache2', 'libapache2-mod-wsgi' ] %} - {% endif %} {{ macros.install_packages(cinder_api_packages | customizable("packages")) }} +RUN echo > /etc/apache2/ports.conf + {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} @@ -27,13 +30,16 @@ MAINTAINER {{ maintainer }} 'httpd', 'mod_wsgi' ] %} +{{ macros.install_packages(cinder_api_packages | customizable("packages")) }} +RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf {% elif base_distro in ['ubuntu'] %} {% set cinder_api_packages = [ 'apache2', 'libapache2-mod-wsgi' ] %} - {% endif %} {{ macros.install_packages(cinder_api_packages | customizable("packages")) }} +RUN echo > /etc/apache2/ports.conf + {% endif %} {% endif %} |