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/fedora | |
| parent | 694265d30a955dae3d72e2cd598e260538c082b5 (diff) | |
| parent | 67c3c6b28ad69bc3ff6ead269e46cea5a7b95bc8 (diff) | |
| download | kolla-996802ba76444cdaef8ccc58ae6e9413fc7dc2d6.tar.gz kolla-996802ba76444cdaef8ccc58ae6e9413fc7dc2d6.zip | |
Merge "Remove crux from base Dockerfiles"
Diffstat (limited to 'docker/fedora')
| -rw-r--r-- | docker/fedora/binary/base/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/fedora/source/base/Dockerfile | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/docker/fedora/binary/base/Dockerfile b/docker/fedora/binary/base/Dockerfile index 2b6776d35..d40738410 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 367e37a47..0b0bcd20c 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 |