From 7bc8af43c34e01252016d0e58445d8ff6be47454 Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Tue, 21 Jul 2015 18:11:07 +0000 Subject: Remove RDO dependency from source images It turns out the only dependencies we need from RDO in the source builds are python-pip, python-cliff for crux, and crudini, all of which can be pulled from pypi. We should remove the dependency on RDO for these builds which is one of the reasons for source builds in the first place. Change-Id: I11e26e96e6c94a5df5db48204714229bbd85a9aa Closes-Bug: #1476760 --- docker/centos/source/base/Dockerfile | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'docker') diff --git a/docker/centos/source/base/Dockerfile b/docker/centos/source/base/Dockerfile index f12a28052..974d79da1 100644 --- a/docker/centos/source/base/Dockerfile +++ b/docker/centos/source/base/Dockerfile @@ -1,18 +1,8 @@ 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 -# 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/sdake/crux/repo/epel-7/sdake-crux-epel-7.repo -o /etc/yum.repos.d/sdake-crux-epel-7.repo - # Dependencies required for building/installing source components RUN yum install -y \ - crux \ - crudini \ gcc \ git \ libffi-devel \ @@ -21,13 +11,19 @@ RUN yum install -y \ openssl \ openssl-devel \ python-devel \ - python-pip \ tar \ libxml2-devel \ libxslt-devel \ && yum clean all -RUN pip install --upgrade pip +RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ + && python get-pip.py \ + && rm get-pip.py + +RUN pip install --upgrade \ + crudini \ + crux \ + pip RUN mkdir -p /opt/kolla COPY service_hosts.sh kolla-common.sh /opt/kolla/ -- cgit v1.2.3