From 68594d873f7a1006fab5d360cb7c55bbb7ed421b Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Mon, 4 May 2015 19:10:22 -0700 Subject: Port to Juno This represents the Juno release of the images. Partially-implements: blueprint port-kilo Change-Id: I2837ec25a2aa093b7fff7519f3ed608ec93736bf --- docker/centos-rdo-base/Dockerfile | 2 +- docker/fedora-rdo-base/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile index 963aadcf9..4db4c7cdb 100644 --- a/docker/centos-rdo-base/Dockerfile +++ b/docker/centos-rdo-base/Dockerfile @@ -2,7 +2,7 @@ FROM centos MAINTAINER Kolla Project (https://launchpad.net/kolla) # Set up repositories -RUN yum -y install http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-4.noarch.rpm && yum clean all +RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm RUN curl https://copr.fedoraproject.org/coprs/larsks/crux/repo/epel-7/larsks-crux-epel-7.repo -o /etc/yum.repos.d/larsks-crux-epel-7.repo 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 diff --git a/docker/fedora-rdo-base/Dockerfile b/docker/fedora-rdo-base/Dockerfile index 96f2e4951..f41cac97e 100644 --- a/docker/fedora-rdo-base/Dockerfile +++ b/docker/fedora-rdo-base/Dockerfile @@ -2,7 +2,7 @@ FROM fedora:20 MAINTAINER Kolla Project (https://launchpad.net/kolla) # Set up repositories -RUN yum -y install https://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-4.noarch.rpm +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 larsks/crux run dnf copr enable -y sdake/pam.noaudit -- cgit v1.2.3