aboutsummaryrefslogtreecommitdiff
path: root/docker/panko
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-06 10:14:03 +0000
committerGerrit Code Review <review@openstack.org>2017-04-06 10:14:03 +0000
commit3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7 (patch)
treed923b0b6e4e8fbf1b97a4fdcf6c4b4b336c1d878 /docker/panko
parenta130ecb153f555ffd96bebf554eaa10c34a1486d (diff)
parent69fef5cd59286b5eeaa4deaf9da97511413ed653 (diff)
downloadkolla-3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7.tar.gz
kolla-3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7.zip
Merge "debian: enable all images enabled for Ubuntu"
Diffstat (limited to 'docker/panko')
-rw-r--r--docker/panko/panko-api/Dockerfile.j22
-rw-r--r--docker/panko/panko-base/Dockerfile.j24
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/panko/panko-api/Dockerfile.j2 b/docker/panko/panko-api/Dockerfile.j2
index 090a2e9bb..336f1bea2 100644
--- a/docker/panko/panko-api/Dockerfile.j2
+++ b/docker/panko/panko-api/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set panko_api_packages = ['openstack-panko-api'] %}
- {% elif base_distro in ['ubuntu'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2
index d4b08b206..da65ec070 100644
--- a/docker/panko/panko-base/Dockerfile.j2
+++ b/docker/panko/panko-base/Dockerfile.j2
@@ -21,7 +21,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(panko_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 ['ubuntu', 'debian'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
@@ -40,7 +40,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
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 ['ubuntu', 'debian'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
{% set panko_base_packages = [
'apache2',