diff options
Diffstat (limited to 'docker/zaqar')
| -rw-r--r-- | docker/zaqar/zaqar-base/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/zaqar/zaqar-server/Dockerfile.j2 | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docker/zaqar/zaqar-base/Dockerfile.j2 b/docker/zaqar/zaqar-base/Dockerfile.j2 index 5c78b5b3d..0255b4a31 100644 --- a/docker/zaqar/zaqar-base/Dockerfile.j2 +++ b/docker/zaqar/zaqar-base/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_package_type == 'rpm' %} {% set zaqar_base_packages = [ 'openstack-zaqar', 'httpd', @@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build && 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 zaqar_base_packages = [ 'zaqar-common', 'apache2', @@ -42,7 +42,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_package_type == 'rpm' %} {% set zaqar_base_packages = [ 'httpd', 'mod_ssl', @@ -54,7 +54,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build && 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 zaqar_base_packages = [ 'apache2', 'libapache2-mod-wsgi', diff --git a/docker/zaqar/zaqar-server/Dockerfile.j2 b/docker/zaqar/zaqar-server/Dockerfile.j2 index 72aeaed50..0c75be754 100644 --- a/docker/zaqar/zaqar-server/Dockerfile.j2 +++ b/docker/zaqar/zaqar-server/Dockerfile.j2 @@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['debian', 'ubuntu'] %} + {% if base_package_type == 'deb' %} {% set zaqar_server_packages = ['zaqar-server'] %} {{ macros.install_packages(zaqar_server_packages | customizable("packages")) }} |
