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/monasca | |
| 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/monasca')
| -rw-r--r-- | docker/monasca/monasca-base/Dockerfile.j2 | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2 index 8ddc63d21..bf4284efe 100644 --- a/docker/monasca/monasca-base/Dockerfile.j2 +++ b/docker/monasca/monasca-base/Dockerfile.j2 @@ -15,29 +15,16 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false {% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} {% set monasca_base_packages = [ - 'httpd', - 'mod_ssl', - 'python3-mod_wsgi', ] %} - -{{ macros.install_packages(monasca_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 monasca_base_packages = [ - 'apache2', - 'libapache2-mod-wsgi-py3', 'librdkafka-dev' ] %} + {% endif %} {{ macros.install_packages(monasca_base_packages | customizable("packages")) }} -RUN truncate -s 0 /etc/apache2/ports.conf - - {% endif %} {% block monasca_source_install %} |