diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-23 11:22:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-23 11:22:00 +0000 |
| commit | 931158b50f224c12f8c6aa29a7b79b72bee2f6af (patch) | |
| tree | 9c9fcd350e25026eab8e492c61ff088d1b168063 /docker | |
| parent | a0a5a63527c3c6991673878b8dec7346b91bf5bd (diff) | |
| parent | d958e24c3d0bf30e9729adf19daf3fa95c1d95d6 (diff) | |
| download | kolla-931158b50f224c12f8c6aa29a7b79b72bee2f6af.tar.gz kolla-931158b50f224c12f8c6aa29a7b79b72bee2f6af.zip | |
Merge "Fix build for oraclelinux base"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 47d90ab6a..8d9ef28e0 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -101,8 +101,9 @@ RUN yum -y install \ yum-utils \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-5.noarch.rpm \ && yum clean all \ + # TODO(pbourke): replace with mirror.centos.org once openstack-mitaka-1-3 is promoted to stable && rpm -Uvh --nodeps \ - http://mirror.centos.org/centos/7/extras/x86_64/Packages/centos-release-openstack-mitaka-1-2.el7.centos.noarch.rpm \ + http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-mitaka/centos-release-openstack-mitaka-1-3.el7.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-hammer-1.0-5.el7.centos.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-1.el7.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-virt-common-1-1.el7.centos.noarch.rpm \ |