From ca6a6bab5412dd13ab19f7043f320efe14a72dbd Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 3 Oct 2017 10:57:53 +0200
Subject: 8755 redirect logs during docker image creation to an artifact file

---
 .gitlab/build.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to '.gitlab/build.sh')

diff --git a/.gitlab/build.sh b/.gitlab/build.sh
index cc63075d..6f989001 100755
--- a/.gitlab/build.sh
+++ b/.gitlab/build.sh
@@ -17,8 +17,13 @@ TAG=${2:-latest}
 DOCKERFILE=docker/${DIR}/${2:-Dockerfile}${2:+.dockerfile}
 TARGET=${CI_REGISTRY_IMAGE}/${DIR}:${TAG}
 
+function quit {
+    echo "Image build failed. Exit value: $?."
+    exit 1
+}
+
 if git diff "$LAST_COMMIT" HEAD --name-only | egrep "($DOCKERFILE|^.gitlab)"; then
-  docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY"
-  docker build -t "$TARGET" -f "$DOCKERFILE" docker/
-  docker push "$TARGET"
+  docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" || quit
+  docker build -t "$TARGET" -f "$DOCKERFILE" docker/ || quit
+  docker push "$TARGET" || quit
 fi
-- 
cgit v1.2.3