diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-24 16:35:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-24 16:35:04 +0000 |
| commit | cb02995b430c880740199e396b4a4be897f96af7 (patch) | |
| tree | 49177a107caa89f8af17ae200784d316877b48cd | |
| parent | 8b5541c85ac9ab40b645452af7aaa2478900def9 (diff) | |
| parent | b3fa0fefee3303f7c405cfa887abdd26f30b5550 (diff) | |
| download | kolla-cb02995b430c880740199e396b4a4be897f96af7.tar.gz kolla-cb02995b430c880740199e396b4a4be897f96af7.zip | |
Merge "Install magnum-common packages for binary builds"
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index b66dd9b7a..eecac5f1e 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -4,11 +4,15 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos'] %} -RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/epel-7/sdake-openstack-magnum-epel-7.repo -o /etc/yum.repos.d/sdake-openstack-magnum-epel-7.repo +RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/epel-7/sdake-openstack-magnum-epel-7.repo -o /etc/yum.repos.d/sdake-openstack-magnum-epel-7.repo \ + && yum install -y openstack-magnum-common \ + && yum clean all {% elif base_distro in ['fedora'] %} -RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/fedora-22/sdake-openstack-magnum-fedora-22.repo -o /etc/yum.repos.d/sdake-openstack-magnum-f22.repo +RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/fedora-22/sdake-openstack-magnum-fedora-22.repo -o /etc/yum.repos.d/sdake-openstack-magnum-f22.repo | + && yum install -y openstack-magnum-common \ + && yum clean all {% elif base_distro in ['oraclelinux'] %} |