diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-13 07:43:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-13 07:43:29 +0000 |
| commit | 4075c3ecbe696a256efbb0ab4c30f4f5e0246eb4 (patch) | |
| tree | a45cd513d70007a174b7b6ca92825636fb61677c /docker | |
| parent | 3bb813075afd623134b26f7bda740d5bf50c49a9 (diff) | |
| parent | 2a19d8e6e30176edfe6a48af79c7fe54e7829124 (diff) | |
| download | kolla-4075c3ecbe696a256efbb0ab4c30f4f5e0246eb4.tar.gz kolla-4075c3ecbe696a256efbb0ab4c30f4f5e0246eb4.zip | |
Merge "Update Magnum dockerfiles for formatting"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/magnum/magnum-api/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/magnum/magnum-conductor/Dockerfile.j2 | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index 4df7ee911..beeed5d7f 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum -y install openstack-magnum-api \ +RUN yum -y install \ + openstack-magnum-api \ && yum clean all {% endif %} diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index 193b03688..dbb66dded 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -5,7 +5,8 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean.repo \ - && yum install -y openstack-magnum-common \ + && yum -y install \ + openstack-magnum-common \ && yum clean all {% endif %} diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index d753e01a2..d0312f22d 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -10,7 +10,11 @@ RUN yum -y install \ && yum clean all # 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 && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl && rm -rf /tmp/kubernetes +RUN cd /tmp \ + && curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz \ + && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz \ + && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl \ + && rm -rf /tmp/kubernetes {% endif %} {% endif %} |