aboutsummaryrefslogtreecommitdiff
path: root/docker/monasca/monasca-base
diff options
context:
space:
mode:
Diffstat (limited to 'docker/monasca/monasca-base')
-rw-r--r--docker/monasca/monasca-base/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2
index bdf5e1475..6adc1a91b 100644
--- a/docker/monasca/monasca-base/Dockerfile.j2
+++ b/docker/monasca/monasca-base/Dockerfile.j2
@@ -14,7 +14,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% if base_package_type == 'rpm' %}
{% set monasca_base_packages = [
'httpd',
'mod_ssl',
@@ -24,7 +24,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{{ 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_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set monasca_base_packages = [
'apache2',