diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-02 01:06:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-02 01:06:40 +0000 |
| commit | 92b129968d1b324867fc459746bcfaacb9905a8d (patch) | |
| tree | 33e730bdcc18a1e8413bc9adcb0b496a6373250a /docker | |
| parent | 34872c1c2f68f4a410c423ed8b615822a29ff94a (diff) | |
| parent | 82db9eb6c7c647d30a65f9e1cecd4ee30aac6912 (diff) | |
| download | kolla-92b129968d1b324867fc459746bcfaacb9905a8d.tar.gz kolla-92b129968d1b324867fc459746bcfaacb9905a8d.zip | |
Merge "Deal with CentOS 7.1 breakage"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/centos-rdo-base/Dockerfile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile index d8c48afdc..44e26af52 100644 --- a/docker/centos-rdo-base/Dockerfile +++ b/docker/centos-rdo-base/Dockerfile @@ -5,6 +5,10 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y https://rdo.fedorapeople.org/rdo-release.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 +# 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 + RUN yum install -y epel-release && yum clean all # Update packages |
