From 0fffc8d650f79dd739998880a86510487f4f5e99 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Sun, 17 May 2015 18:02:54 -0700 Subject: Use kilo-1 packages as per documentation Follow upstream documentation to use kilo packages. Change-Id: Id5265a3086ffdb687ac8d52ea0e328c9be5b2934 Co-authored-by: Daneyon Hanse --- docker/centos-rdo-base/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile index d045ba3f5..f4e6a7419 100644 --- a/docker/centos-rdo-base/Dockerfile +++ b/docker/centos-rdo-base/Dockerfile @@ -2,11 +2,12 @@ FROM centos MAINTAINER Kolla Project (https://launchpad.net/kolla) # Set up repositories -RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm -RUN curl https://repos.fedorapeople.org/repos/openstack/openstack-trunk/epel-7/rc2/delorean-kilo.repo -o /etc/yum.repos.d/delorean-kilo.repo +RUN yum -y install https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm +RUN yum -y install http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm RUN curl https://copr.fedoraproject.org/coprs/larsks/crux/repo/epel-7/larsks-crux-epel-7.repo -o /etc/yum.repos.d/larsks-crux-epel-7.repo RUN curl https://copr.fedoraproject.org/coprs/sdake/pam.noaudit/repo/epel-7/sdake-pam.noaudit-epel-7.repo -o /etc/yum.repos.d/sdake-pam.noaudit-epel-7.repo + # CentOS 7.1 workaround for conflicting packages with libvirt RUN rpm -e --nodeps systemd-container systemd-container-libs RUN rpm -e --nodeps yum-plugin-fastestmirror -- cgit v1.2.3