From f7ee75598f42287192a1a8b399dbc0a0fd255184 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Tue, 18 Oct 2016 12:53:31 +0300 Subject: [PATCH] Convert parent image specification to image_spec calls Change-Id: I1beacb14acc9e1c963127d3b14282a1bc714f2f0 Depends-On: I18281bdb41e91cd5c9160055f1617d7ee9d3b548 --- docker/heat-api/Dockerfile.j2 | 2 +- docker/heat-base/Dockerfile.j2 | 2 +- docker/heat-engine/Dockerfile.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/heat-api/Dockerfile.j2 b/docker/heat-api/Dockerfile.j2 index 3f5b894..7dff32d 100644 --- a/docker/heat-api/Dockerfile.j2 +++ b/docker/heat-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/heat-base:{{ tag }} +FROM {{ image_spec("heat-base") }} MAINTAINER {{ maintainer }} #mysql-client only for provisioning need to be removed later diff --git a/docker/heat-base/Dockerfile.j2 b/docker/heat-base/Dockerfile.j2 index d15f5f8..c3c0a16 100644 --- a/docker/heat-base/Dockerfile.j2 +++ b/docker/heat-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/openstack-base:{{ tag }} +FROM {{ image_spec("openstack-base") }} MAINTAINER {{ maintainer }} {{ copy_sources("openstack/heat", "/heat") }} diff --git a/docker/heat-engine/Dockerfile.j2 b/docker/heat-engine/Dockerfile.j2 index edcc923..172a070 100644 --- a/docker/heat-engine/Dockerfile.j2 +++ b/docker/heat-engine/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/heat-base:{{ tag }} +FROM {{ image_spec("heat-base") }} MAINTAINER {{ maintainer }} USER heat