aboutsummaryrefslogtreecommitdiff
path: root/docker/swift/swift-base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-16 11:20:30 +0000
committerGerrit Code Review <review@openstack.org>2016-08-16 11:20:30 +0000
commite3ca26f9e555e06e6588d7dca421a1d99563ee96 (patch)
tree16f6b028f048cf6db6790ac15044ca039f66cf0c /docker/swift/swift-base
parent856d0a866c2802de2394d54c9f516cfef13d07c0 (diff)
parent503120657e9e4def55a2d3397c44bd4d1e110c52 (diff)
downloadkolla-e3ca26f9e555e06e6588d7dca421a1d99563ee96.tar.gz
kolla-e3ca26f9e555e06e6588d7dca421a1d99563ee96.zip
Merge "Customizations for Swift"
Diffstat (limited to 'docker/swift/swift-base')
-rw-r--r--docker/swift/swift-base/Dockerfile.j231
1 files changed, 12 insertions, 19 deletions
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index 2e05ac29f..15bf9ee49 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-base/Dockerfile.j2
@@ -1,35 +1,25 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }}
+{% import "macros.j2" as macros with context %}
+
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
- openstack-swift \
- && yum clean all
-
+ {% set swift_base_packages = ['openstack-swift'] %}
{% elif base_distro in ['ubuntu'] %}
+ {% set swift_base_packages = ['swift'] %}
+ {% endif %}
-RUN apt-get -y install --no-install-recommends \
- swift \
- && apt-get clean
+RUN {{ macros.install_packages(swift_base_packages | customizable("packages")) }}
- {% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
- liberasurecode-devel \
- && yum clean all
-
+ {% set swift_base_packages = ['liberasurecode-devel'] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get -y install --no-install-recommends \
- liberasurecode-dev \
- && apt-get clean
-
+ {% set swift_base_packages = ['liberasurecode-dev'] %}
{% endif %}
+RUN {{ macros.install_packages(swift_base_packages | customizable("packages")) }}
ADD swift-base-archive /swift-base-source
RUN ln -s swift-base-source/* swift \
&& useradd --user-group swift \
@@ -56,3 +46,6 @@ COPY build-swift-ring.py /usr/local/bin/kolla_build_swift_ring
RUN mkdir -p /opt/swift
RUN usermod -a -G kolla swift
+
+{% block swift_base_footer %}{% endblock %}
+{% block footer %}{% endblock %}