Update Swift dockerfiles for formatting

Change-Id: Ib61f757e20aaec5941fd989ed5a4cd44f1424a80
Partial-Bug:#1569417
changes/75/304775/1
Swapnil Kulkarni (coolsvap) 7 years ago
parent 3f9f267a42
commit 7959c9ffc8
  1. 3
      docker/swift/swift-account/Dockerfile.j2
  2. 3
      docker/swift/swift-base/Dockerfile.j2
  3. 3
      docker/swift/swift-container/Dockerfile.j2
  4. 3
      docker/swift/swift-object/Dockerfile.j2
  5. 3
      docker/swift/swift-proxy-server/Dockerfile.j2
  6. 6
      docker/swift/swift-rsyncd/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'] %}

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

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

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

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

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

Loading…
Cancel
Save