diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-22 15:34:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-22 15:35:00 +0000 |
| commit | a10d4250c24c9266994257a68d9c7293459cd3af (patch) | |
| tree | efb6e164d2498e5662ef225fd2b00fd67e412cd3 /docker | |
| parent | 66aed157fe5371e641d390921ff2b0a3d973f66e (diff) | |
| parent | a7dcf89c2adbd459e4dbac8bb1bdea5f87aa700e (diff) | |
| download | kolla-a10d4250c24c9266994257a68d9c7293459cd3af.tar.gz kolla-a10d4250c24c9266994257a68d9c7293459cd3af.zip | |
Merge "Swift ubuntu binary container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/swift/swift-account/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/swift/swift-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/swift/swift-container/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/swift/swift-object/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/swift/swift-proxy-server/Dockerfile.j2 | 6 |
5 files changed, 30 insertions, 0 deletions
diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2 index 4ab70ac6f..e17cf72a2 100644 --- a/docker/swift/swift-account/Dockerfile.j2 +++ b/docker/swift/swift-account/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum -y install openstack-swift-account \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + swift-account \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 4bcf51014..639b997bc 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum -y install openstack-swift \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + swift \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2 index ce7e10f73..0f0a84781 100644 --- a/docker/swift/swift-container/Dockerfile.j2 +++ b/docker/swift/swift-container/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum -y install openstack-swift-container \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + swift-container \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2 index 5dc27404f..20bac715c 100644 --- a/docker/swift/swift-object/Dockerfile.j2 +++ b/docker/swift/swift-object/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum -y install openstack-swift-object \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + swift-object \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 8d8f73977..298bcf598 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum -y install openstack-swift-proxy \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + swift-proxy \ + && apt-get clean + {% endif %} {% endif %} |