diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-10-02 13:12:40 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-10-02 13:52:43 +0200 |
| commit | af96104859b803ac52ae096b2529a67b0f1725af (patch) | |
| tree | 2e5a251202eb28ca4eb5cdb4616ef580c4399609 /docker | |
| parent | 52b62e4fb4070aec9059b18bf630550f35eee7e2 (diff) | |
Add ${DOCKER_TAG} in Docker hooks
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 <cedric.ollivier@orange.com>
(cherry picked from commit 29647efa114151d53ede5ba2d989593992c0b29f)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/components/hooks/post_checkout | 2 | ||||
| -rw-r--r-- | docker/features/hooks/post_checkout | 2 | ||||
| -rw-r--r-- | docker/healthcheck/hooks/post_checkout | 2 | ||||
| -rw-r--r-- | docker/restapi/hooks/post_checkout | 2 | ||||
| -rw-r--r-- | docker/smoke/hooks/post_checkout | 2 | ||||
| -rw-r--r-- | 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 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 $? diff --git a/docker/features/hooks/post_checkout b/docker/features/hooks/post_checkout index 8f5e4337a..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:euphrates" +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 8f5e4337a..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:euphrates" +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 8f5e4337a..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:euphrates" +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 8f5e4337a..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:euphrates" +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 8f5e4337a..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:euphrates" +from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}" sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile exit $? |