From 503120657e9e4def55a2d3397c44bd4d1e110c52 Mon Sep 17 00:00:00 2001 From: Shaun Smekel Date: Fri, 12 Aug 2016 07:16:19 +1000 Subject: Customizations for Swift This patchset contains customization of Dockerfile of Swift containers. Change-Id: I69250c4d9f6cc3949c9b9b52ea4b0cc2aec0231e Partially-implements: blueprint third-party-plugin-support --- docker/swift/swift-proxy-server/Dockerfile.j2 | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'docker/swift/swift-proxy-server') diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 22e53b845..6ba07b902 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -1,22 +1,21 @@ FROM {{ namespace }}/{{ image_prefix }}swift-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-proxy \ - && yum clean all - + {% set swift_proxy_server_packages = ['openstack-swift-proxy'] %} {% elif base_distro in ['ubuntu'] %} + {% set swift_proxy_server_packages = ['swift-proxy'] %} + {% endif %} -RUN apt-get -y install --no-install-recommends \ - swift-proxy \ - && apt-get clean +RUN {{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }} - {% endif %} {% endif %} +{% block swift_proxy_server_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER swift -- cgit v1.2.3