summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-10-02 13:12:40 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-10-02 13:13:25 +0200
commit29647efa114151d53ede5ba2d989593992c0b29f (patch)
tree4f3095c58ae7acf81846dafaf4ecb469346e8072 /docker
parent36b648a6e928ac0819a607cd2231faa803418b7a (diff)
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>
Diffstat (limited to 'docker')
-rw-r--r--docker/components/hooks/post_checkout2
-rw-r--r--docker/features/hooks/post_checkout2
-rw-r--r--docker/healthcheck/hooks/post_checkout2
-rw-r--r--docker/restapi/hooks/post_checkout2
-rw-r--r--docker/smoke/hooks/post_checkout2
-rw-r--r--docker/vnf/hooks/post_checkout2
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 $?