openstack/kolla-ansible
Code Issues Proposed changes

Merge "Trove ubuntu binary container"

Browse Source
This commit is contained in:
Jenkins 2016-02-17 15:06:25 +00:00 committed by Gerrit Code Review
commit d077fa279c
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/trove/trove-api/Dockerfile.j2
View File

@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
RUN yum install -y openstack-trove-api \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
trove-api \
&& apt-get clean
{% endif %}
{% endif %}

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

@ -8,6 +8,12 @@ RUN yum -y install \
openstack-trove-common \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
trove-common \
&& apt-get clean
{% endif %}
{% elif install_type == 'source' %}

6
docker/trove/trove-conductor/Dockerfile.j2
View File

@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
RUN yum install -y openstack-trove-conductor \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
trove-conductor \
&& apt-get clean
{% endif %}
{% endif %}

6
docker/trove/trove-guestagent/Dockerfile.j2
View File

@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
RUN yum install -y openstack-trove-guestagent \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
trove-guestagent \
&& apt-get clean
{% endif %}
{% endif %}

6
docker/trove/trove-taskmanager/Dockerfile.j2
View File

@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
RUN yum install -y openstack-trove-taskmanager \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
trove-taskmanager \
&& apt-get clean
{% endif %}
{% endif %}