From bc52005ac0af69bce31512584775c991b1aa6326 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Wed, 13 Sep 2017 17:32:01 +0200 Subject: Fix dind and zun images and oraclelinux build - dind need setuptools to install docker through pip in binary install - oraclelinux fails to install due opstools repo and openstack mitaka repos missing. - zun removed moved nova out of etc because is not used. https://github.com/openstack/zun/commit/6dc286616727fde6e4d22b415bd961ebd8854920 Change-Id: Ic4eb0f2e97a108be3c854c95eede27b5cd411b5c Closes-Bug: #1716952 --- docker/base/Dockerfile.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docker/base') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 803bd5f4b..eab6ce537 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -186,9 +186,8 @@ RUN yum -y install \ yum-utils \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ && rpm -Uvh --nodeps \ - https://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-jewel-1.0-1.el7.centos.noarch.rpm \ - http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-opstools-1-6.el7.centos.noarch.rpm \ + http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-opstools-1-7.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 \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-storage-common-1-2.el7.centos.noarch.rpm \ -- cgit v1.2.3