From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 2 Oct 2017 11:12:40 +0000 (+0200)
Subject: Add ${DOCKER_TAG} in Docker hooks
X-Git-Tag: opnfv-6.0.0~389
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=29647efa114151d53ede5ba2d989593992c0b29f;p=functest.git

Add ${DOCKER_TAG} in Docker hooks

It eases creating Docker images based on branches or tags.

Change-Id: Id84513c53cad72a1fcd0debf06579481609b8bc2
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/docker/components/hooks/post_checkout b/docker/components/hooks/post_checkout
index 20a6d4b95..8d0e98124 100644
--- a/docker/components/hooks/post_checkout
+++ b/docker/components/hooks/post_checkout
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-from="${DOCKER_REPO%/*}/functest-core"
+from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}"
 sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
 
 exit $?
diff --git a/docker/features/hooks/post_checkout b/docker/features/hooks/post_checkout
index 20a6d4b95..8d0e98124 100644
--- a/docker/features/hooks/post_checkout
+++ b/docker/features/hooks/post_checkout
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-from="${DOCKER_REPO%/*}/functest-core"
+from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}"
 sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
 
 exit $?
diff --git a/docker/healthcheck/hooks/post_checkout b/docker/healthcheck/hooks/post_checkout
index 20a6d4b95..8d0e98124 100644
--- a/docker/healthcheck/hooks/post_checkout
+++ b/docker/healthcheck/hooks/post_checkout
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-from="${DOCKER_REPO%/*}/functest-core"
+from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}"
 sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
 
 exit $?
diff --git a/docker/restapi/hooks/post_checkout b/docker/restapi/hooks/post_checkout
index 20a6d4b95..8d0e98124 100644
--- a/docker/restapi/hooks/post_checkout
+++ b/docker/restapi/hooks/post_checkout
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-from="${DOCKER_REPO%/*}/functest-core"
+from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}"
 sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
 
 exit $?
diff --git a/docker/smoke/hooks/post_checkout b/docker/smoke/hooks/post_checkout
index 20a6d4b95..8d0e98124 100644
--- a/docker/smoke/hooks/post_checkout
+++ b/docker/smoke/hooks/post_checkout
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-from="${DOCKER_REPO%/*}/functest-core"
+from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}"
 sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
 
 exit $?
diff --git a/docker/vnf/hooks/post_checkout b/docker/vnf/hooks/post_checkout
index 20a6d4b95..8d0e98124 100644
--- a/docker/vnf/hooks/post_checkout
+++ b/docker/vnf/hooks/post_checkout
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-from="${DOCKER_REPO%/*}/functest-core"
+from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}"
 sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
 
 exit $?