diff options
| author | Zuul <zuul@review.openstack.org> | 2019-01-18 21:01:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-01-18 21:01:55 +0000 |
| commit | cea1c1ebd95e88e0bb2911fea486fe09f600af22 (patch) | |
| tree | a53f9c4f6c1fce4364758a5de52ccebc68c36120 /docker/panko | |
| parent | 8344c8ea21428c5978d3c5e7ae74d6e43dd8ba95 (diff) | |
| parent | ae1322ec10861678abe1137f3013030b34335bc7 (diff) | |
| download | kolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.tar.gz kolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.zip | |
Merge "Use base_package_type"
Diffstat (limited to 'docker/panko')
| -rw-r--r-- | docker/panko/panko-api/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/panko/panko-base/Dockerfile.j2 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docker/panko/panko-api/Dockerfile.j2 b/docker/panko/panko-api/Dockerfile.j2 index 565df5679..9e3a06167 100644 --- a/docker/panko/panko-api/Dockerfile.j2 +++ b/docker/panko/panko-api/Dockerfile.j2 @@ -6,13 +6,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_package_type == 'rpm' %} {% set panko_api_packages = [ 'openstack-panko-api', 'python-pymongo' ] %} - {% elif base_distro in ['debian', 'ubuntu'] %} + {% elif base_package_type == 'deb' %} {% set panko_api_packages = [ 'panko-api', 'python-pymongo' diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2 index 7d5ac90d0..1c8757f30 100644 --- a/docker/panko/panko-base/Dockerfile.j2 +++ b/docker/panko/panko-base/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='panko') }} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_package_type == 'rpm' %} {% set panko_base_packages = [ 'httpd', @@ -21,7 +21,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ 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 ['debian', 'ubuntu'] %} + {% elif base_package_type == 'deb' %} {% set panko_base_packages = [ 'apache2', 'libapache2-mod-wsgi' @@ -30,7 +30,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ RUN echo > /etc/apache2/ports.conf {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_package_type == 'rpm' %} {% set panko_base_packages = [ 'httpd', @@ -42,7 +42,7 @@ RUN echo > /etc/apache2/ports.conf 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 panko_base_packages = [ 'apache2', |