diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 28 | ||||
| -rw-r--r-- | docker/base/ceph.yum.repo | 19 | ||||
| -rw-r--r-- | docker/base/versionlock.list | 26 |
3 files changed, 34 insertions, 39 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index cddca0b65..cd147b43a 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -38,12 +38,9 @@ COPY kibana.yum.repo /etc/yum.repos.d/kibana.yum.repo # Turns on MariaDB repos throughout the RPM build COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo -COPY ceph.yum.repo /etc/yum.repos.d/ceph.repo - RUN yum -y install http://repo.percona.com/release/7/RPMS/x86_64/percona-release-0.1-3.noarch.rpm RUN rpm --import http://yum.mariadb.org/RPM-GPG-KEY-MariaDB \ - && rpm --import https://download.ceph.com/keys/release.asc \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Percona \ && rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch @@ -67,8 +64,14 @@ RUN yum-config-manager --enable rhel-7-server-rpms \ {% if base_distro == 'centos' %} RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 \ - && yum install -y epel-release yum-plugin-priorities \ + && yum install -y \ + epel-release \ + yum-plugin-priorities \ + centos-release-ceph-hammer \ + centos-release-qemu-ev \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \ + && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage \ + && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization \ && yum clean all {% endif %} @@ -79,7 +82,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 \ # Enable couple required repositories for all RHEL builds # Turn on EPEL throughout the build RUN yum install -y \ - https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ + https://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-5.noarch.rpm \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \ && yum -y install yum-plugin-priorities \ && yum clean all \ @@ -92,12 +95,23 @@ RUN yum install -y \ {% if base_distro == 'oraclelinux' %} COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo + RUN yum install -y \ tar \ yum-utils \ - https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ + http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-5.noarch.rpm \ + && yum clean all \ + && rpm -Uvh --nodeps \ + http://mirror.centos.org/centos/7/extras/x86_64/Packages/centos-release-openstack-mitaka-1-2.el7.centos.noarch.rpm \ + http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-hammer-1.0-5.el7.centos.noarch.rpm \ + http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-1.el7.noarch.rpm \ + http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-virt-common-1-1.el7.centos.noarch.rpm \ + http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-storage-common-1-2.el7.centos.noarch.rpm \ + && sed -i 's/\$releasever/7/g' /etc/yum.repos.d/CentOS-*.repo \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \ - && yum clean all + && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage \ + && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization + RUN yum-config-manager --enable ol7_optional_latest ol7_addons RUN yum install -y yum-plugin-priorities \ && yum clean all diff --git a/docker/base/ceph.yum.repo b/docker/base/ceph.yum.repo deleted file mode 100644 index 91bb2ecf6..000000000 --- a/docker/base/ceph.yum.repo +++ /dev/null @@ -1,19 +0,0 @@ -[ceph-x86_64] -name=Ceph x86_64 packages -baseurl=http://download.ceph.com/rpm-hammer/el7/x86_64 -enabled=1 -priority=2 -gpgcheck=1 -type=rpm-md -gpgkey=https://download.ceph.com/keys/release.asc -timeout=90 - -[ceph-noarch] -name=Ceph noarch packages -baseurl=http://download.ceph.com/rpm-hammer/el7/noarch -enabled=1 -priority=2 -gpgcheck=1 -type=rpm-md -gpgkey=https://download.ceph.com/keys/release.asc -timeout=90 diff --git a/docker/base/versionlock.list b/docker/base/versionlock.list index 4d480bc56..9a4aa1bf4 100644 --- a/docker/base/versionlock.list +++ b/docker/base/versionlock.list @@ -1,13 +1,13 @@ -1:ceph-0.94.5-0.el7.centos.* -1:ceph-common-0.94.5-0.el7.centos.* -1:ceph-debuginfo-0.94.5-0.el7.centos.* -1:ceph-devel-compat-0.94.5-0.el7.centos.* -1:ceph-libs-compat-0.94.5-0.el7.centos.* -1:ceph-radosgw-0.94.5-0.el7.centos.* -1:libcephfs1-0.94.5-0.el7.centos.* -1:librados2-0.94.5-0.el7.centos.* -1:librbd1-0.94.5-0.el7.centos.* -1:mesos-0.27.1 -1:python-cephfs-0.94.5-0.el7.centos.* -1:python-rados-0.94.5-0.el7.centos.* -1:python-rbd-0.94.5-0.el7.centos.* +1:ceph-0.94.5-1.el7.* +1:ceph-common-0.94.5-1.el7.* +1:ceph-debuginfo-0.94.5-0.el7.* +1:ceph-devel-compat-0.94.5-1.el7.* +1:ceph-libs-compat-0.94.5-1.el7.* +1:ceph-radosgw-0.94.5-1.el7.* +1:librados2-0.94.5-1.el7.* +1:libcephfs1-0.94.5-1.el7.* +1:librbd1-0.94.5-1.el7.* +1:mesos-0.27.1* +1:python-cephfs-0.94.5-1.el7.* +1:python-rados-0.94.5-1.el7.* +1:python-rbd-0.94.5-1.el7.* |