diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:12:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:12:12 +0000 |
| commit | 996802ba76444cdaef8ccc58ae6e9413fc7dc2d6 (patch) | |
| tree | 061d174fccd4ac635d25f7b9d3b738a84cab4242 /docker/centos | |
| parent | 694265d30a955dae3d72e2cd598e260538c082b5 (diff) | |
| parent | 67c3c6b28ad69bc3ff6ead269e46cea5a7b95bc8 (diff) | |
| download | kolla-996802ba76444cdaef8ccc58ae6e9413fc7dc2d6.tar.gz kolla-996802ba76444cdaef8ccc58ae6e9413fc7dc2d6.zip | |
Merge "Remove crux from base Dockerfiles"
Diffstat (limited to 'docker/centos')
| -rw-r--r-- | docker/centos/binary/base/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/centos/source/base/Dockerfile | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/docker/centos/binary/base/Dockerfile b/docker/centos/binary/base/Dockerfile index 1003d8df2..31b2566f7 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 91e19915f..e8e96e777 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 |