Merge "Switch to Docker post_checkout hooks"

diff --git a/docker/components/hooks/build b/docker/components/hooks/build
deleted file mode 100644 (file)
index e5d15b5..0000000
--- 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 (file)
index 0000000..20a6d4b
--- /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 (file)
index e5d15b5..0000000
--- 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 (file)
index 0000000..20a6d4b
--- /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 (file)
index e5d15b5..0000000
--- 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 (file)
index 0000000..20a6d4b
--- /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 (file)
index e5d15b5..0000000
--- 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 (file)
index 0000000..20a6d4b
--- /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 $?