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/monasca | |
| 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/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 %} |
