diff options
| author | Steven Dake <stdake@cisco.com> | 2015-05-04 17:26:30 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-05-06 09:58:43 -0700 |
| commit | d30f69bc8327bf37e013c9647c99d9192eec8830 (patch) | |
| tree | b3f831de844ea86a011a14fca23f97ec72b63db9 /docker/heat | |
| parent | d8a7af93eb7b05c74082526b23cb4347851d95cf (diff) | |
| download | kolla-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/heat')
| -rw-r--r-- | docker/heat/heat-api-cfn/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/heat/heat-api/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/heat/heat-base/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/heat/heat-engine/Dockerfile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docker/heat/heat-api-cfn/Dockerfile b/docker/heat/heat-api-cfn/Dockerfile index 2fa2ad5de..18a7e369d 100644 --- a/docker/heat/heat-api-cfn/Dockerfile +++ b/docker/heat/heat-api-cfn/Dockerfile @@ -1,4 +1,4 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install \ diff --git a/docker/heat/heat-api/Dockerfile b/docker/heat/heat-api/Dockerfile index 76149b280..407aee601 100644 --- a/docker/heat/heat-api/Dockerfile +++ b/docker/heat/heat-api/Dockerfile @@ -1,4 +1,4 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%% 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 4e5646b55..ebe9fa15c 100644 --- a/docker/heat/heat-base/Dockerfile +++ b/docker/heat/heat-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 mkdir -p /opt/kolla diff --git a/docker/heat/heat-engine/Dockerfile b/docker/heat/heat-engine/Dockerfile index 544830d06..227ac335d 100644 --- a/docker/heat/heat-engine/Dockerfile +++ b/docker/heat/heat-engine/Dockerfile @@ -1,4 +1,4 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install \ |