From 7959c9ffc8464dd843410d381e696631d3942bf0 Mon Sep 17 00:00:00 2001
From: "Swapnil Kulkarni (coolsvap)" <me@coolsvap.net>
Date: Tue, 12 Apr 2016 22:04:52 +0530
Subject: [PATCH] Update Swift dockerfiles for formatting
Change-Id: Ib61f757e20aaec5941fd989ed5a4cd44f1424a80
Partial-Bug:#1569417
---
docker/swift/swift-account/Dockerfile.j2 | 3 ++-
docker/swift/swift-base/Dockerfile.j2 | 3 ++-
docker/swift/swift-container/Dockerfile.j2 | 3 ++-
docker/swift/swift-object/Dockerfile.j2 | 3 ++-
docker/swift/swift-proxy-server/Dockerfile.j2 | 3 ++-
docker/swift/swift-rsyncd/Dockerfile.j2 | 6 ++++--
6 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2
index e17cf72a2a..3023147c53 100644
--- a/docker/swift/swift-account/Dockerfile.j2
+++ b/docker/swift/swift-account/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum -y install openstack-swift-account \
+RUN yum -y install \
+ openstack-swift-account \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index 639b997bc8..11aa75ecdf 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-base/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum -y install openstack-swift \
+RUN yum -y install \
+ openstack-swift \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2
index 0f0a847815..126818e29b 100644
--- a/docker/swift/swift-container/Dockerfile.j2
+++ b/docker/swift/swift-container/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum -y install openstack-swift-container \
+RUN yum -y install \
+ openstack-swift-container \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2
index 20bac715ca..344d470417 100644
--- a/docker/swift/swift-object/Dockerfile.j2
+++ b/docker/swift/swift-object/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum -y install openstack-swift-object \
+RUN yum -y install \
+ openstack-swift-object \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
index 298bcf598b..d168705b6e 100644
--- a/docker/swift/swift-proxy-server/Dockerfile.j2
+++ b/docker/swift/swift-proxy-server/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum -y install openstack-swift-proxy \
+RUN yum -y install \
+ openstack-swift-proxy \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2
index 7afd4f8c2d..fbe19b0af4 100644
--- a/docker/swift/swift-rsyncd/Dockerfile.j2
+++ b/docker/swift/swift-rsyncd/Dockerfile.j2
@@ -3,12 +3,14 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
-RUN yum install -y rsync \
+RUN yum -y install \
+ rsync \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
-RUN apt-get install -y --no-install-recommends rsync \
+RUN apt-get install -y --no-install-recommends \
+ rsync \
&& apt-get clean
{% endif %}