openstack
/
kolla
Code Issues Proposed changes

Update Magnum dockerfiles for formatting 

Change-Id: Ieaad94d423d58b153bbf7f634be44a0e48ac775f
Partial-Bug:#1569417
This commit is contained in:
Swapnil Kulkarni (coolsvap) 2016-04-12 21:37:56 +05:30
parent 3f9f267a42
commit 2a19d8e6e3
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/magnum/magnum-api/Dockerfile.j2
View File

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

3
docker/magnum/magnum-base/Dockerfile.j2
View File

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

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

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