diff options
| author | James Kirsch <generalfuzz@gmail.com> | 2020-07-30 12:36:39 -0700 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-08-10 09:51:07 +0000 |
| commit | 5bdf514645e6ba603f813f299c68ff7fb12daa3c (patch) | |
| tree | 2bd0ed0e4f532575e59e646657afd33a0affe35d /docker/vitrage | |
| parent | 69092eb574222564fcd3ce752a41db7fe51d61b8 (diff) | |
| download | kolla-5bdf514645e6ba603f813f299c68ff7fb12daa3c.tar.gz kolla-5bdf514645e6ba603f813f299c68ff7fb12daa3c.zip | |
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
Diffstat (limited to 'docker/vitrage')
| -rw-r--r-- | docker/vitrage/vitrage-api/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker/vitrage/vitrage-base/Dockerfile.j2 | 10 |
2 files changed, 3 insertions, 19 deletions
diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2 index 169a4b12b..a4f1a78ba 100644 --- a/docker/vitrage/vitrage-api/Dockerfile.j2 +++ b/docker/vitrage/vitrage-api/Dockerfile.j2 @@ -12,31 +12,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set vitrage_api_packages = [ - 'httpd', - 'mod_ssl', 'openstack-vitrage-api', - 'python3-ldappool', - 'python3-mod_wsgi' + 'python3-ldappool' ] %} {{ macros.install_packages(vitrage_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' %} {% if base_distro == 'debian' %} {% set vitrage_api_packages = [ - 'apache2', - 'libapache2-mod-wsgi-py3', 'python3-ldappool', 'vitrage-api' ] %} {{ macros.install_packages(vitrage_api_packages | customizable("packages")) }} RUN mkdir -p /var/www/cgi-bin/vitrage \ - && cp -a /usr/lib/python3/dist-packages/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage/ \ - && echo > /etc/apache2/ports.conf + && cp -a /usr/lib/python3/dist-packages/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage/ {% else %} diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2 index 9c6188ffc..0fb62b3da 100644 --- a/docker/vitrage/vitrage-base/Dockerfile.j2 +++ b/docker/vitrage/vitrage-base/Dockerfile.j2 @@ -45,26 +45,18 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% if base_package_type == 'rpm' %} {% set vitrage_base_packages = [ - 'httpd', - 'mod_ssl', - 'python3-ldappool', - 'python3-mod_wsgi' + 'python3-ldappool' ] %} {{ macros.install_packages(vitrage_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 vitrage_base_packages = [ - 'apache2', - 'libapache2-mod-wsgi-py3', 'python3-ldappool' ] %} {{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} -RUN echo > /etc/apache2/ports.conf {% endif %} {% set vitrage_base_pip_packages = [ |