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/freezer | |
| 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/freezer')
| -rw-r--r-- | docker/freezer/freezer-api/Dockerfile.j2 | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2 index f6bba058c..27651d6ef 100644 --- a/docker/freezer/freezer-api/Dockerfile.j2 +++ b/docker/freezer/freezer-api/Dockerfile.j2 @@ -14,28 +14,11 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - {% set freezer_api_packages = [ - 'httpd', - 'mod_ssl', - 'python3-mod_wsgi' + {% set freezer_api_packages = [ ] %} {{ macros.install_packages(freezer_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 freezer_api_packages = [ - 'apache2', - 'libapache2-mod-wsgi-py3' - ] %} - -{{ macros.install_packages(freezer_api_packages | customizable("packages")) }} - -RUN echo > /etc/apache2/ports.conf - {% endif %} - ADD freezer-api-archive /freezer-api-source {% set freezer_api_pip_packages = [ |