From 67c3c6b28ad69bc3ff6ead269e46cea5a7b95bc8 Mon Sep 17 00:00:00 2001 From: Swapnil Kulkarni Date: Sun, 9 Aug 2015 01:26:30 +0000 Subject: [PATCH] Remove crux from base Dockerfiles With blueprint remove-config-internal we no longer require crux. Removing it from base images Dockerfiles Partially implements: blueprint remove-config-internal Change-Id: Iccddaf41945a69e78978288dc2012299b21bc9a9 --- docker/centos/binary/base/Dockerfile | 3 --- docker/centos/source/base/Dockerfile | 1 - docker/fedora/binary/base/Dockerfile | 2 -- docker/fedora/source/base/Dockerfile | 7 +------ docker/ol/source/base/Dockerfile | 8 +------- docker/ubuntu/source/base/Dockerfile | 1 - 6 files changed, 2 insertions(+), 20 deletions(-) diff --git a/docker/centos/binary/base/Dockerfile b/docker/centos/binary/base/Dockerfile index 1003d8df21..31b2566f75 100644 --- a/docker/centos/binary/base/Dockerfile +++ b/docker/centos/binary/base/Dockerfile @@ -6,8 +6,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) 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 -# 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 # 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 @@ -23,7 +21,6 @@ RUN yum update -y && yum clean all # Install base packages RUN yum install -y \ - crux \ mariadb \ mariadb-libs \ openssl \ diff --git a/docker/centos/source/base/Dockerfile b/docker/centos/source/base/Dockerfile index 91e19915f1..e8e96e7777 100644 --- a/docker/centos/source/base/Dockerfile +++ b/docker/centos/source/base/Dockerfile @@ -31,7 +31,6 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ RUN pip install --upgrade \ cachetools \ crudini \ - crux \ pip \ tox diff --git a/docker/fedora/binary/base/Dockerfile b/docker/fedora/binary/base/Dockerfile index 2b6776d35b..d407384104 100644 --- a/docker/fedora/binary/base/Dockerfile +++ b/docker/fedora/binary/base/Dockerfile @@ -4,7 +4,6 @@ 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 dnf dnf-plugins-core && yum clean all -RUN dnf copr enable -y sdake/crux RUN dnf copr enable -y sdake/pam.noaudit @@ -14,7 +13,6 @@ RUN yum update -y && yum clean all # Install base packages RUN yum install -y \ iproute \ - crux \ mariadb \ mariadb-libs \ openssl \ diff --git a/docker/fedora/source/base/Dockerfile b/docker/fedora/source/base/Dockerfile index 367e37a47c..0b0bcd20cb 100644 --- a/docker/fedora/source/base/Dockerfile +++ b/docker/fedora/source/base/Dockerfile @@ -1,13 +1,8 @@ FROM fedora:21 MAINTAINER Kolla Project (https://launchpad.net/kolla) -# 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 \ gcc \ git \ libffi-devel \ @@ -30,7 +25,7 @@ RUN yum install -y \ # the only dependencies we need from RDO in the source builds are -# python-pip, python-cliff for crux, and crudini, +# python-pip, python-cliff for crudini, # all of which can be pulled from pypi. # also the older version of pip does not have support for wheels # we are installing from source pip is the important for diff --git a/docker/ol/source/base/Dockerfile b/docker/ol/source/base/Dockerfile index f75e563282..f9a76c9bdd 100644 --- a/docker/ol/source/base/Dockerfile +++ b/docker/ol/source/base/Dockerfile @@ -14,7 +14,7 @@ RUN yum install -y \ tar \ && yum clean all -# TODO(pbourke): replace pip and crux below with rpms once available in Oracle +# TODO(pbourke): replace pip below with rpms once available in Oracle # repos RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && python get-pip.py \ @@ -22,10 +22,4 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ RUN pip install crudini -RUN curl https://codeload.github.com/larsks/crux/tar.gz/7 -o /crux-7.tar.gz \ - && tar -xf /crux-7.tar.gz \ - && pip install -r /crux-7/requirements.txt \ - && pip install /crux-7 \ - && rm -rf /crux-7.tar.gz /crux-7 - COPY kolla-common.sh /opt/kolla/ diff --git a/docker/ubuntu/source/base/Dockerfile b/docker/ubuntu/source/base/Dockerfile index 5509ceda1a..d85fcb42b1 100644 --- a/docker/ubuntu/source/base/Dockerfile +++ b/docker/ubuntu/source/base/Dockerfile @@ -33,7 +33,6 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ RUN pip install --upgrade \ cachetools \ crudini \ - crux \ pip \ tox