diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-21 09:34:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-21 09:34:52 +0000 |
| commit | 7e4f78130b4a3492ce6a67d809ba3020737f900d (patch) | |
| tree | 362b59ee628442f0089419efc69fbe571f716826 /docker | |
| parent | a466bcb9396407c8e4c961526a5c95492c0b5371 (diff) | |
| parent | c7a9835b683d0177c93dd2751ec9acb688e106f9 (diff) | |
| download | kolla-7e4f78130b4a3492ce6a67d809ba3020737f900d.tar.gz kolla-7e4f78130b4a3492ce6a67d809ba3020737f900d.zip | |
Merge "Improve dry-ness of base dockerfile.j2"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 502103d4e..e1ef6d7ae 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -47,12 +47,10 @@ COPY ceph.yum.repo /etc/yum.repos.d/ceph.repo RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm \ && sed -i 's|$releasever|centos/latest|g' /etc/yum.repos.d/percona-release.repo - {% if install_metatype == 'rdo' %} + {% if install_metatype in ['rdo', 'mixed'] %} -# This repository provides all dependencies used by RDO OpenStack -RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm -# This repository provides latest packages built from trunk master into RPMs -RUN curl http://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean-current.repo +# These repos provide latest packages built from trunk master into RPMs +RUN curl http://trunk.rdoproject.org/centos7/current-passed-ci/delorean.repo -o /etc/yum.repos.d/delorean.repo RUN curl http://trunk.rdoproject.org/centos7/delorean-deps.repo -o /etc/yum.repos.d/delorean-deps.repo {% endif %} @@ -133,14 +131,6 @@ RUN yum install -y \ {% if install_type == 'source' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - -# Set up repositories -RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \ - && yum clean all - - {% endif %} - # Update packages RUN yum -y install \ curl \ |