From 5bdf514645e6ba603f813f299c68ff7fb12daa3c Mon Sep 17 00:00:00 2001 From: James Kirsch Date: Thu, 30 Jul 2020 12:36:39 -0700 Subject: Refactor httpd install to base image Refactor installing and initial setup of httpd and mod wsgi from individual services to base image. Change-Id: I651a55a9ebe258ef403d33de010a4dfb368a4021 --- docker/monasca/monasca-base/Dockerfile.j2 | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'docker/monasca') diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2 index 8ddc63d21..bf4284efe 100644 --- a/docker/monasca/monasca-base/Dockerfile.j2 +++ b/docker/monasca/monasca-base/Dockerfile.j2 @@ -15,29 +15,16 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false {% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} {% set monasca_base_packages = [ - 'httpd', - 'mod_ssl', - 'python3-mod_wsgi', ] %} - -{{ macros.install_packages(monasca_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 monasca_base_packages = [ - 'apache2', - 'libapache2-mod-wsgi-py3', 'librdkafka-dev' ] %} + {% endif %} {{ macros.install_packages(monasca_base_packages | customizable("packages")) }} -RUN truncate -s 0 /etc/apache2/ports.conf - - {% endif %} {% block monasca_source_install %} -- cgit v1.2.3