diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-16 11:20:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-16 11:20:30 +0000 |
| commit | e3ca26f9e555e06e6588d7dca421a1d99563ee96 (patch) | |
| tree | 16f6b028f048cf6db6790ac15044ca039f66cf0c /docker/swift/swift-proxy-server | |
| parent | 856d0a866c2802de2394d54c9f516cfef13d07c0 (diff) | |
| parent | 503120657e9e4def55a2d3397c44bd4d1e110c52 (diff) | |
| download | kolla-e3ca26f9e555e06e6588d7dca421a1d99563ee96.tar.gz kolla-e3ca26f9e555e06e6588d7dca421a1d99563ee96.zip | |
Merge "Customizations for Swift"
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 |
