Merge "Trove ubuntu binary container"

docker/trove/trove-api/Dockerfile.j2

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

docker/trove/trove-base/Dockerfile.j2

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

docker/trove/trove-conductor/Dockerfile.j2

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

docker/trove/trove-guestagent/Dockerfile.j2

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

docker/trove/trove-taskmanager/Dockerfile.j2

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