aboutsummaryrefslogtreecommitdiff
path: root/docker/heat
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-08-10 17:52:00 +0000
committerGerrit Code Review <review@openstack.org>2020-08-10 17:52:00 +0000
commitfd60c657101167b056177ae95aa2c695f14a93d4 (patch)
treedf61e63de4539721bbafca2e6eb224b019c99a73 /docker/heat
parent7f4a32e1a38b7887c165b88d6ea3c31cef29abca (diff)
parent5bdf514645e6ba603f813f299c68ff7fb12daa3c (diff)
downloadkolla-fd60c657101167b056177ae95aa2c695f14a93d4.tar.gz
kolla-fd60c657101167b056177ae95aa2c695f14a93d4.zip
Merge "Refactor httpd install to base image"
Diffstat (limited to 'docker/heat')
-rw-r--r--docker/heat/heat-base/Dockerfile.j231
1 files changed, 2 insertions, 29 deletions
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index 4819f5291..dadf35f52 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
@@ -13,49 +13,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{% set heat_base_packages = [
- 'httpd',
- 'mod_ssl',
- 'openstack-heat-common',
- 'python3-mod_wsgi'
+ 'openstack-heat-common'
] %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
-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' %}
{% set heat_base_packages = [
- 'apache2',
- 'heat-common',
- 'libapache2-mod-wsgi-py3'
+ 'heat-common'
] %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
-RUN echo > /etc/apache2/ports.conf
{% endif %}
{% elif install_type == 'source' %}
-
-{% if base_package_type == 'rpm' %}
-
{% set heat_base_packages = [
- 'httpd',
- 'mod_ssl',
- 'python3-mod_wsgi'
] %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
-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' %}
-
- {% set heat_base_packages = [
- 'apache2',
- 'libapache2-mod-wsgi-py3'
- ] %}
-
-{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
-RUN echo > /etc/apache2/ports.conf
-{% endif %}
ADD heat-base-archive /heat-base-source