aboutsummaryrefslogtreecommitdiff
path: root/docker/swift/swift-base
diff options
context:
space:
mode:
Diffstat (limited to 'docker/swift/swift-base')
-rw-r--r--docker/swift/swift-base/Dockerfile.j28
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index 947a243f2..c5b81d657 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-base/Dockerfile.j2
@@ -8,13 +8,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='swift') }}
{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% if base_package_type == 'rpm' %}
{% set swift_base_packages = [
'openstack-swift',
'nmap-ncat'
]
%}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set swift_base_packages = [
'swift',
'netcat-openbsd'
@@ -24,9 +24,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(swift_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% if base_package_type == 'rpm' %}
{% set swift_base_packages = ['liberasurecode-devel','nmap-ncat'] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set swift_base_packages = ['liberasurecode-dev','netcat-openbsd'] %}
{% endif %}