diff options
| author | Steven Dake <stdake@cisco.com> | 2015-05-24 12:55:36 -0700 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@redhat.com> | 2015-05-26 13:44:57 -0400 |
| commit | 23370e52d432c73d331aef88eaf5a820dcff966d (patch) | |
| tree | 771fca4f264c09498119497b071d079d999d8cf1 /docker/centos | |
| parent | e832e352951655ea1afdfd493b1b6f5055fedd6e (diff) | |
| download | kolla-23370e52d432c73d331aef88eaf5a820dcff966d.tar.gz kolla-23370e52d432c73d331aef88eaf5a820dcff966d.zip | |
Use latest delorean repo location
The latest delorean repo location is needed instead of the "rc2"
location used previously.
Also document what the repos do in the dockerfile.
Change-Id: Ic9033d08784d67a2629b2f5c60fb9a4f6db53529
Diffstat (limited to 'docker/centos')
| -rw-r--r-- | docker/centos/binary/centos-binary-base/Dockerfile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/centos/binary/centos-binary-base/Dockerfile b/docker/centos/binary/centos-binary-base/Dockerfile index d045ba3f5..0043ed303 100644 --- a/docker/centos/binary/centos-binary-base/Dockerfile +++ b/docker/centos/binary/centos-binary-base/Dockerfile @@ -2,9 +2,13 @@ FROM centos MAINTAINER Kolla Project (https://launchpad.net/kolla) # Set up repositories +# This repository provides all dependencies used by RDO OpenStack 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 +# This repository provides latest packages built from trunk master into RPMs +RUN curl http://trunk.rdoproject.org/centos70/current/delorean.repo -o /etc/yum.repos.d/delorean-current.repo +# This repository provides crux which permits idempotent operation of RDO 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 +# This repository turns off auth in PAM so we can operate on Ubuntu 14.04 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 |