diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-22 18:06:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-22 18:06:52 +0000 |
| commit | 71d2b7efdb7850e8e329d2fb7281e2e487825206 (patch) | |
| tree | 0ca28d51ed3995c9c66df47cd1807c282dfe2886 /docker | |
| parent | 455014217764bdec9e4221c213b63de7a60dd868 (diff) | |
| parent | d0026fad3d13779cb3d5b98c255c33ee2847ff12 (diff) | |
| download | kolla-71d2b7efdb7850e8e329d2fb7281e2e487825206.tar.gz kolla-71d2b7efdb7850e8e329d2fb7281e2e487825206.zip | |
Merge "Have curl follow redirects when downloading magnum repository"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index d03205167..d4c84c315 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -4,14 +4,14 @@ 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 -L 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 \ && rpm --import https://copr-be.cloud.fedoraproject.org/results/sdake/openstack-magnum/pubkey.gpg \ && 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 -L 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 \ && rpm --import https://copr-be.cloud.fedoraproject.org/results/sdake/openstack-magnum/pubkey.gpg \ && yum install -y openstack-magnum-common \ && yum clean all |