summaryrefslogtreecommitdiff
path: root/docker/heat
diff options
context:
space:
mode:
authorMartin André <martin.andre@kvhasia.com>2015-02-26 15:00:42 +0900
committerMartin André <martin.andre@kvhasia.com>2015-03-02 14:08:06 +0900
commit0764fd7dea3f56627bb42e285cfb818cce08229e (patch)
treeb31933605cef228bca79737cbefc94b79c5e2e8f /docker/heat
parent5052e54f45998110ec10239bb715ff80d51042ab (diff)
downloadkolla-0764fd7dea3f56627bb42e285cfb818cce08229e.tar.gz
kolla-0764fd7dea3f56627bb42e285cfb818cce08229e.zip
Allow changing base image
By changing the PREFIX variable in the .buildconf one is now able to build docker images from different bases. For example, add the following line to your .buildconf file to build CentOS based images: PREFIX=centos-rdo- Default base image is Fedora. For now only RH family is supported. Additionally, changing the namespace either with the NAMESPACE variable in .buildconf or via --namespace commandline option now changes the source namespace as well from the default kollaglue one. Implements: blueprint multi-baseos Co-Authored-By: Steven Dake <stdake@cisco.com> Change-Id: I3964cd2292789ea883a1f2d2738a5731a4fff49b
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 \