diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-27 21:17:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-27 21:17:43 +0000 |
| commit | cd4602819c954547c74e3dc6c2e13aae0e393460 (patch) | |
| tree | 9b7b7368ed4b86a77ddc99f87d7ee90a13c0f2d1 /docker | |
| parent | ee390f1ed5c5bb9a957aadb95e2008cf192050f2 (diff) | |
| parent | b60d8bc629e6c5947c3c722c3eb320de8656a277 (diff) | |
| download | kolla-cd4602819c954547c74e3dc6c2e13aae0e393460.tar.gz kolla-cd4602819c954547c74e3dc6c2e13aae0e393460.zip | |
Merge "Add support for magnum ubuntu binary containers"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/magnum/magnum-api/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/magnum/magnum-conductor/Dockerfile.j2 | 9 |
3 files changed, 20 insertions, 1 deletions
diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index beeed5d7f..16b8bf765 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -8,6 +8,12 @@ RUN yum -y install \ openstack-magnum-api \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get -y install --no-install-recommends \ + magnum-api\ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index dbb66dded..a6f83fab5 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -9,6 +9,12 @@ RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/y openstack-magnum-common \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get -y install --no-install-recommends \ + magnum-common \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index d0312f22d..c71ac3fb7 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -9,6 +9,14 @@ RUN yum -y install \ tar \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get -y install --no-install-recommends \ + magnum-conductor\ + && apt-get clean + + {% endif %} + # Install kubectl binary (ugh) RUN cd /tmp \ && curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz \ @@ -16,7 +24,6 @@ RUN cd /tmp \ && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl \ && rm -rf /tmp/kubernetes - {% endif %} {% endif %} {{ include_footer }} |