diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-17 15:06:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-17 15:06:25 +0000 |
| commit | d077fa279c69c9a56d2bae138e5b8cfa62991d78 (patch) | |
| tree | 2e74580b1dddf67038b16731b94092d8db2fc51c | |
| parent | 881227148478cebc5823ba1c17cebd3248f62cba (diff) | |
| parent | 94a79b16529529c64c3ca88658b337b171a292d8 (diff) | |
| download | kolla-d077fa279c69c9a56d2bae138e5b8cfa62991d78.tar.gz kolla-d077fa279c69c9a56d2bae138e5b8cfa62991d78.zip | |
Merge "Trove ubuntu binary container"
| -rw-r--r-- | docker/trove/trove-api/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/trove/trove-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/trove/trove-conductor/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/trove/trove-guestagent/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/trove/trove-taskmanager/Dockerfile.j2 | 6 |
5 files changed, 30 insertions, 0 deletions
diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index 10a46c5bf..93bcf9ffe 100644 --- a/docker/trove/trove-api/Dockerfile.j2 +++ b/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 %} diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2 index cd32f1961..f0f0f76c3 100644 --- a/docker/trove/trove-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2 index a41fdfc0b..63efeb212 100644 --- a/docker/trove/trove-conductor/Dockerfile.j2 +++ b/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 %} diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2 index 22666b989..8bfea68e7 100644 --- a/docker/trove/trove-guestagent/Dockerfile.j2 +++ b/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 %} diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2 index cc3647f97..e5bb1e4ba 100644 --- a/docker/trove/trove-taskmanager/Dockerfile.j2 +++ b/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 %} |