From af96104859b803ac52ae096b2529a67b0f1725af Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 2 Oct 2017 13:12:40 +0200 Subject: Add ${DOCKER_TAG} in Docker hooks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It eases creating Docker images based on branches or tags. Conflicts: docker/components/hooks/post_checkout docker/features/hooks/post_checkout docker/healthcheck/hooks/post_checkout docker/restapi/hooks/post_checkout docker/smoke/hooks/post_checkout docker/vnf/hooks/post_checkout Change-Id: Id84513c53cad72a1fcd0debf06579481609b8bc2 Signed-off-by: Cédric Ollivier (cherry picked from commit 29647efa114151d53ede5ba2d989593992c0b29f) --- docker/components/hooks/post_checkout | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/components/hooks/post_checkout') diff --git a/docker/components/hooks/post_checkout b/docker/components/hooks/post_checkout index 8f5e4337a..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:euphrates" +from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}" sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile exit $? -- cgit 1.2.3-korg