From fd85ffb2053267297f7a777a936946aaee7b77c6 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 3 Aug 2017 09:56:20 +0200
Subject: Switch to Docker post_checkout hooks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Automated builds work when Dockerfile is modified after checkout.
Otherwise they are not triggered [1].

[1] https://github.com/docker/hub-feedback/issues/518

Change-Id: I6ba9e06f9e62011d2f1c1788f2647b1175842ef3
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 docker/smoke/hooks/build         | 7 -------
 docker/smoke/hooks/post_checkout | 6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 docker/smoke/hooks/build
 create mode 100644 docker/smoke/hooks/post_checkout

(limited to 'docker/smoke')

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 $?
-- 
cgit 1.2.3-korg