aboutsummaryrefslogtreecommitdiff
path: root/docker/centos-rdo-base
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-05-04 17:26:30 -0700
committerSteven Dake <stdake@cisco.com>2015-05-06 09:58:43 -0700
commitd30f69bc8327bf37e013c9647c99d9192eec8830 (patch)
treeb3f831de844ea86a011a14fca23f97ec72b63db9 /docker/centos-rdo-base
parentd8a7af93eb7b05c74082526b23cb4347851d95cf (diff)
downloadkolla-d30f69bc8327bf37e013c9647c99d9192eec8830.tar.gz
kolla-d30f69bc8327bf37e013c9647c99d9192eec8830.zip
Port to icehouse
This represents making build-docker-images --release build with the icehouse tag and causes docker-compsoe to pull from the icehouse tag. Partially-implements: blueprint port-kilo Change-Id: I66b2c39abc55c0f47152dd90e696fc46b9c58f50
Diffstat (limited to 'docker/centos-rdo-base')
-rw-r--r--docker/centos-rdo-base/Dockerfile6
1 files changed, 1 insertions, 5 deletions
diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile
index 2b6c1d7f3..963aadcf9 100644
--- a/docker/centos-rdo-base/Dockerfile
+++ b/docker/centos-rdo-base/Dockerfile
@@ -2,14 +2,10 @@ FROM centos
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Set up repositories
-RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm
+RUN yum -y install http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-4.noarch.rpm && yum clean all
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
-
-RUN sed "s/Derived from Red Hat Enterprise Linux 7.1 (Source)/7/" "/etc/yum.repos.d/rdo-release.repo" -i
-
# CentOS 7.1 workaround for conflicting packages with libvirt
RUN rpm -e --nodeps systemd-container systemd-container-libs
RUN yum -y install systemd systemd-libs systemd-devel && yum clean all