diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-04-28 14:38:18 +0100 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-05-16 09:18:32 +0000 |
| commit | d958e24c3d0bf30e9729adf19daf3fa95c1d95d6 (patch) | |
| tree | 6fcd033522553ceec8f3fe0de58eb9fd5d8958b4 | |
| parent | cb8e3b605eff14893636092b4b3c99c1eda4f82e (diff) | |
| download | kolla-d958e24c3d0bf30e9729adf19daf3fa95c1d95d6.tar.gz kolla-d958e24c3d0bf30e9729adf19daf3fa95c1d95d6.zip | |
Fix build for oraclelinux base
centos-release-openstack-mitaka 1.3 is now available via the
delorean-mitaka-testing repo. We need to install this directly instead
of the 1.2 version as otherwise the subsequent 'yum update' tries to
install it and fails on the centos-release dependency which is
incompatible with the oraclelinux base.
Closes-Bug: 1576238
Change-Id: I51cb372424b27b32e95f9e81c5dddbe8e49a6131
| -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 \ |