openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update Swift dockerfiles for formatting"

Browse Source
This commit is contained in:
Jenkins 2016-04-13 07:49:12 +00:00 committed by Gerrit Code Review
commit b042f4d517
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/swift/swift-account/Dockerfile.j2
View File

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

3
docker/swift/swift-base/Dockerfile.j2
View File

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

3
docker/swift/swift-container/Dockerfile.j2
View File

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

3
docker/swift/swift-object/Dockerfile.j2
View File

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

3
docker/swift/swift-proxy-server/Dockerfile.j2
View File

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

6
docker/swift/swift-rsyncd/Dockerfile.j2
View File

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