aboutsummaryrefslogtreecommitdiff
path: root/docker/glance
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-06 00:44:02 +0000
committerGerrit Code Review <review@openstack.org>2015-03-06 00:44:02 +0000
commitc3114b961086be034c6674a916361e2033c87986 (patch)
tree0a957c08d9d7c1505b53231d2cd52aef09bf4dc9 /docker/glance
parenteaf15893a0af7fef1825601bedbd2704a291dd33 (diff)
parent0764fd7dea3f56627bb42e285cfb818cce08229e (diff)
downloadkolla-c3114b961086be034c6674a916361e2033c87986.tar.gz
kolla-c3114b961086be034c6674a916361e2033c87986.zip
Merge "Allow changing base image"
Diffstat (limited to 'docker/glance')
-rw-r--r--docker/glance/glance-api/Dockerfile2
-rw-r--r--docker/glance/glance-base/Dockerfile2
-rw-r--r--docker/glance/glance-registry/Dockerfile2
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/glance/glance-api/Dockerfile b/docker/glance/glance-api/Dockerfile
index d416f15a8..0ce10935c 100644
--- a/docker/glance/glance-api/Dockerfile
+++ b/docker/glance/glance-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-glance-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
VOLUME /var/lib/glance
diff --git a/docker/glance/glance-base/Dockerfile b/docker/glance/glance-base/Dockerfile
index 0cc1d2f55..2998cd19c 100644
--- a/docker/glance/glance-base/Dockerfile
+++ b/docker/glance/glance-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-glance ; yum clean all
diff --git a/docker/glance/glance-registry/Dockerfile b/docker/glance/glance-registry/Dockerfile
index c35d275f6..fc8442516 100644
--- a/docker/glance/glance-registry/Dockerfile
+++ b/docker/glance/glance-registry/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-glance-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh