diff options
author | 2017-08-10 08:58:43 +0000 | |
---|---|---|
committer | 2017-08-10 08:58:43 +0000 | |
commit | cafd4b4d34bdebd8158c1b4c7b9dee272b570bb2 (patch) | |
tree | 612091d2d57a880ddc6b1541b512c19d54a4584d | |
parent | 7a9a5e6c6eaa9f38eb455f4822934c60c7bc8fb5 (diff) | |
parent | fd85ffb2053267297f7a777a936946aaee7b77c6 (diff) |
Merge "Switch to Docker post_checkout hooks"
-rw-r--r-- | docker/components/hooks/build | 7 | ||||
-rw-r--r-- | docker/components/hooks/post_checkout | 6 | ||||
-rw-r--r-- | docker/features/hooks/build | 7 | ||||
-rw-r--r-- | docker/features/hooks/post_checkout | 6 | ||||
-rw-r--r-- | docker/healthcheck/hooks/build | 7 | ||||
-rw-r--r-- | docker/healthcheck/hooks/post_checkout | 6 | ||||
-rw-r--r-- | docker/smoke/hooks/build | 7 | ||||
-rw-r--r-- | docker/smoke/hooks/post_checkout | 6 |
8 files changed, 24 insertions, 28 deletions
diff --git a/docker/components/hooks/build b/docker/components/hooks/build deleted file mode 100644 index e5d15b52..00000000 --- a/docker/components/hooks/build +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -from="${DOCKER_REPO%/*}/functest-core" -sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile && - docker build -t "${IMAGE_NAME}" . - -exit $? diff --git a/docker/components/hooks/post_checkout b/docker/components/hooks/post_checkout new file mode 100644 index 00000000..20a6d4b9 --- /dev/null +++ b/docker/components/hooks/post_checkout @@ -0,0 +1,6 @@ +#!/bin/bash + +from="${DOCKER_REPO%/*}/functest-core" +sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile + +exit $? diff --git a/docker/features/hooks/build b/docker/features/hooks/build deleted file mode 100644 index e5d15b52..00000000 --- a/docker/features/hooks/build +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -from="${DOCKER_REPO%/*}/functest-core" -sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile && - docker build -t "${IMAGE_NAME}" . - -exit $? diff --git a/docker/features/hooks/post_checkout b/docker/features/hooks/post_checkout new file mode 100644 index 00000000..20a6d4b9 --- /dev/null +++ b/docker/features/hooks/post_checkout @@ -0,0 +1,6 @@ +#!/bin/bash + +from="${DOCKER_REPO%/*}/functest-core" +sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile + +exit $? diff --git a/docker/healthcheck/hooks/build b/docker/healthcheck/hooks/build deleted file mode 100644 index e5d15b52..00000000 --- a/docker/healthcheck/hooks/build +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -from="${DOCKER_REPO%/*}/functest-core" -sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile && - docker build -t "${IMAGE_NAME}" . - -exit $? diff --git a/docker/healthcheck/hooks/post_checkout b/docker/healthcheck/hooks/post_checkout new file mode 100644 index 00000000..20a6d4b9 --- /dev/null +++ b/docker/healthcheck/hooks/post_checkout @@ -0,0 +1,6 @@ +#!/bin/bash + +from="${DOCKER_REPO%/*}/functest-core" +sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile + +exit $? diff --git a/docker/smoke/hooks/build b/docker/smoke/hooks/build deleted file mode 100644 index e5d15b52..00000000 --- a/docker/smoke/hooks/build +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -from="${DOCKER_REPO%/*}/functest-core" -sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile && - docker build -t "${IMAGE_NAME}" . - -exit $? diff --git a/docker/smoke/hooks/post_checkout b/docker/smoke/hooks/post_checkout new file mode 100644 index 00000000..20a6d4b9 --- /dev/null +++ b/docker/smoke/hooks/post_checkout @@ -0,0 +1,6 @@ +#!/bin/bash + +from="${DOCKER_REPO%/*}/functest-core" +sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile + +exit $? |