From a7dcf89c2adbd459e4dbac8bb1bdea5f87aa700e Mon Sep 17 00:00:00 2001
From: MD NADEEM <mail2nadeem92@gmail.com>
Date: Mon, 8 Feb 2016 12:22:14 +0530
Subject: Swift ubuntu binary container

Change-Id: I4ead909143c0089d5b07568b27dc37222da95561
Partially-Implements: blueprint binary-ubuntu
---
 docker/swift/swift-account/Dockerfile.j2      | 6 ++++++
 docker/swift/swift-base/Dockerfile.j2         | 6 ++++++
 docker/swift/swift-container/Dockerfile.j2    | 6 ++++++
 docker/swift/swift-object/Dockerfile.j2       | 6 ++++++
 docker/swift/swift-proxy-server/Dockerfile.j2 | 6 ++++++
 5 files changed, 30 insertions(+)

(limited to 'docker/swift')

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 880050cfb..d71fdb1d3 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 %}
 
-- 
cgit v1.2.3