From ce94f823d4a9e689bfb3d38272d55434a7ff9627 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Sat, 20 Sep 2014 10:39:52 -0700 Subject: Base images from Fedora 20 + RDO Icehouse Previously images were based from RHEL OSP + RDO Icehouse. This presents a problem in that internal urls are used to access the rhel7 repositories. For new contributors, we need something that can be accessed without special rhel7 permissions. mariadb and rabbitmq can from fedora cinder, glance, keystone can from fedora-rdo-base This patch also uses the RDO repositories from upstream. This patch also udpates the base fedora image with latest bits. --- docker/glance/glance-api/Dockerfile | 2 +- docker/glance/glance-base/Dockerfile | 2 +- docker/glance/glance-registry/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docker/glance') diff --git a/docker/glance/glance-api/Dockerfile b/docker/glance/glance-api/Dockerfile index 10e713fa5..382445c00 100644 --- a/docker/glance/glance-api/Dockerfile +++ b/docker/glance/glance-api/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.usersys.redhat.com/larsks/glance-base +FROM glance-base MAINTAINER Lars Kellogg-Stedman ADD ./start.sh /start.sh diff --git a/docker/glance/glance-base/Dockerfile b/docker/glance/glance-base/Dockerfile index d9967cd7b..b76e56c32 100644 --- a/docker/glance/glance-base/Dockerfile +++ b/docker/glance/glance-base/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.usersys.redhat.com/lhh1/rhel-osp-base +FROM fedora-rdo-base MAINTAINER Lars Kellogg-Stedman RUN yum -y install \ diff --git a/docker/glance/glance-registry/Dockerfile b/docker/glance/glance-registry/Dockerfile index 10e713fa5..e51be06ec 100644 --- a/docker/glance/glance-registry/Dockerfile +++ b/docker/glance/glance-registry/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.usersys.redhat.com/larsks/glance-base +FROM fedora-rdo-base MAINTAINER Lars Kellogg-Stedman ADD ./start.sh /start.sh -- cgit v1.2.3