aboutsummaryrefslogtreecommitdiff
path: root/docker/glance
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-05-04 17:26:30 -0700
committerSteven Dake <stdake@cisco.com>2015-05-06 09:58:43 -0700
commitd30f69bc8327bf37e013c9647c99d9192eec8830 (patch)
treeb3f831de844ea86a011a14fca23f97ec72b63db9 /docker/glance
parentd8a7af93eb7b05c74082526b23cb4347851d95cf (diff)
downloadkolla-d30f69bc8327bf37e013c9647c99d9192eec8830.tar.gz
kolla-d30f69bc8327bf37e013c9647c99d9192eec8830.zip
Port to icehouse
This represents making build-docker-images --release build with the icehouse tag and causes docker-compsoe to pull from the icehouse tag. Partially-implements: blueprint port-kilo Change-Id: I66b2c39abc55c0f47152dd90e696fc46b9c58f50
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 0ce10935c..a4bd45bd1 100644
--- a/docker/glance/glance-api/Dockerfile
+++ b/docker/glance/glance-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
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 74b5c0e23..67b788fcc 100644
--- a/docker/glance/glance-base/Dockerfile
+++ b/docker/glance/glance-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
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 e9937dc7f..f950ce685 100644
--- a/docker/glance/glance-registry/Dockerfile
+++ b/docker/glance/glance-registry/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh