From 7ff6d95039a026fdf63e7c9181f86702fbb401c3 Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Fri, 5 Oct 2018 18:14:38 +0200
Subject: [PATCH] Fix Jenkins build for non-master branch

(trying to)
---
 Jenkinsfile        |  4 +---
 jenkins-rebuild.sh | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100755 jenkins-rebuild.sh

diff --git a/Jenkinsfile b/Jenkinsfile
index 5cc763e..5a2f10f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,10 +34,8 @@ pipeline {
             steps {
                 script {
                     try {
-			sh '(ls -l ; docker ps -a ; docker image ls ; echo Destroying ; bin/destroy.sh ; docker image ls) 2>&1 | tee debug'	// temporary
                         sh './download-midpoint 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
-                        sh 'bin/rebuild.sh 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
-                        //sh 'echo Build output ; cat debug'
+                        sh './jenkins-rebuild.sh 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'			// temporary
                     } catch (error) {
                         def error_details = readFile('./debug')
                         def message = "BUILD ERROR: There was a problem building ${imagename}:${tag}. \n\n ${error_details}"
diff --git a/jenkins-rebuild.sh b/jenkins-rebuild.sh
new file mode 100755
index 0000000..5430852
--- /dev/null
+++ b/jenkins-rebuild.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Temporary workaround for docker/util not rebuilding the specific version of the image
+
+# from destroy.sh (adapted)
+
+result=$(docker ps -a | grep $maintainer/$imagename:$tag)
+
+if [ ! -z "$result" ]; then
+  docker rm -f $(docker ps -a | grep $maintainer/$imagename:$tag | awk '{print $1}')
+  docker rmi -f $maintainer/$imagename:$tag
+fi
+
+# from build.sh (adapted)
+
+echo "Building new Docker image($maintainer/$imagename:$tag)"
+docker build --rm -t $maintainer/$imagename:$tag --build-arg maintainer=$maintainer --build-arg imagename=$imagename .