From 29647efa114151d53ede5ba2d989593992c0b29f Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
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.
Change-Id: Id84513c53cad72a1fcd0debf06579481609b8bc2
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
docker/components/hooks/post_checkout | 2 +-
docker/features/hooks/post_checkout | 2 +-
docker/healthcheck/hooks/post_checkout | 2 +-
docker/restapi/hooks/post_checkout | 2 +-
docker/smoke/hooks/post_checkout | 2 +-
docker/vnf/hooks/post_checkout | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
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 $?
--
cgit