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/cinder | |
| 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/cinder')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 37 |
1 files changed, 4 insertions, 33 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index d62db9ca1..57f4407b0 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -10,51 +10,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} {% set cinder_api_packages = [ - 'httpd', - 'mod_ssl', - 'python3-keystone', - 'python3-mod_wsgi' + 'python3-keystone' ] %} -{{ macros.install_packages(cinder_api_packages | customizable("packages")) }} -RUN mkdir -p /var/www/cgi-bin/cinder \ - && cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi \ - && 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 cinder_api_packages = [ - 'apache2', - 'cinder-api', - 'libapache2-mod-wsgi-py3' + 'cinder-api' ] %} + {% endif %} {{ macros.install_packages(cinder_api_packages | customizable("packages")) }} RUN mkdir -p /var/www/cgi-bin/cinder \ - && cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi \ - && echo > /etc/apache2/ports.conf - {% endif %} + && cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi {% elif install_type == 'source' %} - - {% if base_package_type == 'rpm' %} {% set cinder_api_packages = [ - 'httpd', - 'mod_ssl', - 'python3-mod_wsgi' ] %} {{ macros.install_packages(cinder_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 cinder_api_packages = [ - 'apache2', - 'libapache2-mod-wsgi-py3' - ] %} -{{ macros.install_packages(cinder_api_packages | customizable("packages")) }} -RUN echo > /etc/apache2/ports.conf - - {% endif %} RUN mkdir -p /var/www/cgi-bin/cinder \ && cp -a /var/lib/kolla/venv/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi |