diff options
| author | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2016-04-12 22:04:52 +0530 |
|---|---|---|
| committer | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2016-04-12 22:04:52 +0530 |
| commit | 7959c9ffc8464dd843410d381e696631d3942bf0 (patch) | |
| tree | 35264db1ba8cd0bc904baa20a95615d4ccf75c2f | |
| parent | 3f9f267a42ea2dcd09a946dc024e68f9b70d930c (diff) | |
| download | kolla-7959c9ffc8464dd843410d381e696631d3942bf0.tar.gz kolla-7959c9ffc8464dd843410d381e696631d3942bf0.zip | |
Update Swift dockerfiles for formatting
Change-Id: Ib61f757e20aaec5941fd989ed5a4cd44f1424a80
Partial-Bug:#1569417
| -rw-r--r-- | docker/swift/swift-account/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/swift/swift-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/swift/swift-container/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/swift/swift-object/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/swift/swift-proxy-server/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | 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 e17cf72a2..3023147c5 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 639b997bc..11aa75ecd 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 0f0a84781..126818e29 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 20bac715c..344d47041 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 298bcf598..d168705b6 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 7afd4f8c2..fbe19b0af 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 %} |