summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuriy Taraday <yorik.sar@gmail.com>2016-10-18 12:53:31 +0300
committerYuriy Taraday <yorik.sar@gmail.com>2016-10-18 12:53:31 +0300
commitf7ee75598f42287192a1a8b399dbc0a0fd255184 (patch)
tree30fc233efc1eb2e046f12915bedefcd93d752164
parent4b2d2017d72a5483917803e31e520f824f15536a (diff)
Convert parent image specification to image_spec calls
Notes
Notes (review): Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@mirantis.com> Code-Review+2: Andrey Pavlov <apavlov@mirantis.com> Code-Review+2: Sergey Reshetnyak <sreshetniak@mirantis.com> Workflow+1: Sergey Reshetnyak <sreshetniak@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 18 Oct 2016 17:31:56 +0000 Reviewed-on: https://review.openstack.org/387946 Project: openstack/fuel-ccp-heat Branch: refs/heads/master
-rw-r--r--docker/heat-api/Dockerfile.j22
-rw-r--r--docker/heat-base/Dockerfile.j22
-rw-r--r--docker/heat-engine/Dockerfile.j22
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 @@
1FROM {{ namespace }}/heat-base:{{ tag }} 1FROM {{ image_spec("heat-base") }}
2MAINTAINER {{ maintainer }} 2MAINTAINER {{ maintainer }}
3 3
4#mysql-client only for provisioning need to be removed later 4#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 @@
1FROM {{ namespace }}/openstack-base:{{ tag }} 1FROM {{ image_spec("openstack-base") }}
2MAINTAINER {{ maintainer }} 2MAINTAINER {{ maintainer }}
3 3
4{{ copy_sources("openstack/heat", "/heat") }} 4{{ 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 @@
1FROM {{ namespace }}/heat-base:{{ tag }} 1FROM {{ image_spec("heat-base") }}
2MAINTAINER {{ maintainer }} 2MAINTAINER {{ maintainer }}
3 3
4USER heat 4USER heat