diff options
| author | Shaun Smekel <shaun.smekel@theorem.net.au> | 2016-08-12 07:16:19 +1000 |
|---|---|---|
| committer | Shaun Smekel <shaun.smekel@theorem.net.au> | 2016-08-12 07:16:19 +1000 |
| commit | 503120657e9e4def55a2d3397c44bd4d1e110c52 (patch) | |
| tree | 374a32dd5dc8818b4a2a88404590f3cec2eaf4e3 /docker/swift/swift-proxy-server | |
| parent | e4259f805b91ce0859e7190f97f8dbf34ee92e45 (diff) | |
| download | kolla-503120657e9e4def55a2d3397c44bd4d1e110c52.tar.gz kolla-503120657e9e4def55a2d3397c44bd4d1e110c52.zip | |
Customizations for Swift
This patchset contains customization of Dockerfile of Swift
containers.
Change-Id: I69250c4d9f6cc3949c9b9b52ea4b0cc2aec0231e
Partially-implements: blueprint third-party-plugin-support
Diffstat (limited to 'docker/swift/swift-proxy-server')
| -rw-r--r-- | docker/swift/swift-proxy-server/Dockerfile.j2 | 17 |
1 files changed, 8 insertions, 9 deletions
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 |