openstack/kolla-ansible
Code Issues Proposed changes

Merge "Swift ubuntu binary container"

Browse Source
This commit is contained in:
Jenkins 2016-02-22 15:34:59 +00:00 committed by Gerrit Code Review
commit a10d4250c2
5 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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