Merge "Swift ubuntu binary container"

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 %}
 

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'] %}

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 %}
 

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 %}
 

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 %}