aboutsummaryrefslogtreecommitdiff
path: root/docker/heat
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/heat
parenteaf15893a0af7fef1825601bedbd2704a291dd33 (diff)
parent0764fd7dea3f56627bb42e285cfb818cce08229e (diff)
downloadkolla-c3114b961086be034c6674a916361e2033c87986.tar.gz
kolla-c3114b961086be034c6674a916361e2033c87986.zip
Merge "Allow changing base image"
Diffstat (limited to 'docker/heat')
-rw-r--r--docker/heat/heat-api/Dockerfile2
-rw-r--r--docker/heat/heat-base/Dockerfile2
-rw-r--r--docker/heat/heat-engine/Dockerfile2
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/heat/heat-api/Dockerfile b/docker/heat/heat-api/Dockerfile
index 36a9436b7..b89f76914 100644
--- a/docker/heat/heat-api/Dockerfile
+++ b/docker/heat/heat-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-heat-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# TODO: configure cfn and cloudwatch
diff --git a/docker/heat/heat-base/Dockerfile b/docker/heat/heat-base/Dockerfile
index 828895db8..4e5646b55 100644
--- a/docker/heat/heat-base/Dockerfile
+++ b/docker/heat/heat-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 mkdir -p /opt/kolla
diff --git a/docker/heat/heat-engine/Dockerfile b/docker/heat/heat-engine/Dockerfile
index be871e98d..f678f84e7 100644
--- a/docker/heat/heat-engine/Dockerfile
+++ b/docker/heat/heat-engine/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-heat-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \