openstack/kolla
Code Issues Proposed changes

Prevent apache from listening on port 80 for heat-base

Browse Source 
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 <jaosorior@redhat.com>
Change-Id: I52573c804bfdf729ef994012abb9d7e4c277585d
Closes-Bug: #1675308
This commit is contained in:
Martin André 2017-03-23 09:51:48 +01:00 committed by Juan Antonio Osorio Robles
parent 464ca08bfe
commit cc2f0462e7
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/heat/heat-base/Dockerfile.j2
View File

@ -15,14 +15,17 @@ MAINTAINER {{ maintainer }}
'httpd', 'httpd',
'mod_wsgi' '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'] %} {% elif base_distro in ['ubuntu'] %}
{% set heat_base_packages = [ {% set heat_base_packages = [
'heat-common', 'heat-common',
'apache2', 'apache2',
'libapache2-mod-wsgi', 'libapache2-mod-wsgi',
] %} ] %}
{% endif %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }} {{ macros.install_packages(heat_base_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
@ -33,6 +36,9 @@ MAINTAINER {{ maintainer }}
'mod_wsgi' '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'] %} {% elif base_distro in ['ubuntu'] %}
{% set heat_base_packages = [ {% set heat_base_packages = [
@ -40,9 +46,9 @@ MAINTAINER {{ maintainer }}
'libapache2-mod-wsgi' 'libapache2-mod-wsgi'
] %} ] %}
{% endif %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }} {{ macros.install_packages(heat_base_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}
ADD heat-base-archive /heat-base-source ADD heat-base-archive /heat-base-source