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/cloudkitty/cloudkitty-api/Dockerfile.j2 | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'docker/cloudkitty') diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index 54c2b70cb..82becbbe0 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -11,14 +11,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set cloudkitty_api_packages = [ - 'httpd', - 'mod_ssl', - 'openstack-cloudkitty-api', - 'python3-mod_wsgi' + 'openstack-cloudkitty-api' ] %} {{ macros.install_packages(cloudkitty_api_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' %} @@ -26,29 +21,11 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false {% endif %} - {% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - {% set cloudkitty_api_packages = [ - 'httpd', - 'mod_ssl', - 'python3-mod_wsgi' - ] %} -{{ macros.install_packages(cloudkitty_api_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 cloudkitty_api_packages = [ - 'apache2', - 'libapache2-mod-wsgi-py3' ] %} {{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} -RUN echo > /etc/apache2/ports.conf - - {% endif %} - {% endif %} COPY extend_start.sh /usr/local/bin/kolla_cloudkitty_extend_start -- cgit v1.2.3