diff options
| author | Zuul <zuul@review.opendev.org> | 2020-08-10 17:52:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-08-10 17:52:00 +0000 |
| commit | fd60c657101167b056177ae95aa2c695f14a93d4 (patch) | |
| tree | df61e63de4539721bbafca2e6eb224b019c99a73 /docker/vitrage | |
| parent | 7f4a32e1a38b7887c165b88d6ea3c31cef29abca (diff) | |
| parent | 5bdf514645e6ba603f813f299c68ff7fb12daa3c (diff) | |
| download | kolla-fd60c657101167b056177ae95aa2c695f14a93d4.tar.gz kolla-fd60c657101167b056177ae95aa2c695f14a93d4.zip | |
Merge "Refactor httpd install to base image"
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 = [ |