From bb7e436bb37eae509b11315a033a6b4a7dc48c59 Mon Sep 17 00:00:00 2001
From: jstastny-cz <jan.stastny@ibm.com>
Date: Mon, 11 Dec 2023 09:37:29 +0100
Subject: [PATCH 1/4] kie-issues#752: kogito-ci-build start docker in
 background

---
 apache-nodes/start-docker.sh | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/apache-nodes/start-docker.sh b/apache-nodes/start-docker.sh
index 9b1422d9a..930eb5537 100755
--- a/apache-nodes/start-docker.sh
+++ b/apache-nodes/start-docker.sh
@@ -4,12 +4,5 @@ source /opt/bash-utils/logger.sh
 INFO "Starting supervisor"
 sudo bash -c "/usr/bin/supervisord >> /dev/null 2>&1" &
 
-INFO "Waiting for docker to be running"
-source wait-for-docker.sh
-if [ $? -ne 0 ]; then
-    ERROR "dockerd is not running after max time"
-    exit 1
-else
-    sudo chown root:docker /var/run/docker.sock
-    INFO "dockerd is running"
-fi
\ No newline at end of file
+INFO "Starting docker"
+bash -c "source wait-for-docker.sh > /dev/null && sudo chown root:docker /var/run/docker.sock" &

From d0c5af5611d1dc6af59fd9de008f5c995250c011 Mon Sep 17 00:00:00 2001
From: jstastny-cz <jan.stastny@ibm.com>
Date: Mon, 11 Dec 2023 10:06:27 +0100
Subject: [PATCH 2/4] fix build pipeline

---
 .ci/jenkins/Jenkinsfile.build-kogito-ci-image | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-kogito-ci-image b/.ci/jenkins/Jenkinsfile.build-kogito-ci-image
index af1b45dca..a3c536d37 100644
--- a/.ci/jenkins/Jenkinsfile.build-kogito-ci-image
+++ b/.ci/jenkins/Jenkinsfile.build-kogito-ci-image
@@ -36,13 +36,13 @@ pipeline {
 
                         sh """
                             docker build -t ${env.IMAGE_NAME_TAG} -f apache-nodes/Dockerfile.kogito-ci-build ./apache-nodes
-                            docker tag ${env.IMAGE_NAME_TAG} ${env.IMAGE_NAME}:${GIT_COMMIT}
+                            docker tag ${env.IMAGE_NAME_TAG} ${env.IMAGE_NAME}:${env.GIT_COMMIT?:githubscm.getCommitHash()}
                             docker tag ${env.IMAGE_NAME_TAG} ${env.IMAGE_NAME}:${BRANCH_NAME}-latest
                         """
 
                         sh """
                             docker --config ${DOCKER_CONFIG} push ${env.IMAGE_NAME_TAG}
-                            docker --config ${DOCKER_CONFIG} push ${env.IMAGE_NAME}:${GIT_COMMIT}
+                            docker --config ${DOCKER_CONFIG} push ${env.IMAGE_NAME}:${env.GIT_COMMIT?:githubscm.getCommitHash()}
                             docker --config ${DOCKER_CONFIG} push ${env.IMAGE_NAME}:${BRANCH_NAME}-latest
                         """
                     }

From 711040e7286dd3ad51c7db18ecc9cc24e16aa975 Mon Sep 17 00:00:00 2001
From: jstastny-cz <jan.stastny@ibm.com>
Date: Mon, 11 Dec 2023 10:36:07 +0100
Subject: [PATCH 3/4] fix build pipeline #2

---
 .ci/jenkins/Jenkinsfile.build-kogito-ci-image | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.ci/jenkins/Jenkinsfile.build-kogito-ci-image b/.ci/jenkins/Jenkinsfile.build-kogito-ci-image
index a3c536d37..a28714e04 100644
--- a/.ci/jenkins/Jenkinsfile.build-kogito-ci-image
+++ b/.ci/jenkins/Jenkinsfile.build-kogito-ci-image
@@ -62,6 +62,7 @@ pipeline {
                 docker {
                     image env.IMAGE_NAME_TAG
                     args '--privileged --group-add docker'
+                    reuseNode true
                 }
             }
             steps {

From b474aad83ac0853083f71f85873ebee5f25793b7 Mon Sep 17 00:00:00 2001
From: jstastny-cz <jan.stastny@ibm.com>
Date: Mon, 11 Dec 2023 12:24:46 +0100
Subject: [PATCH 4/4] Revert "fix build pipeline #2"

This reverts commit 711040e7286dd3ad51c7db18ecc9cc24e16aa975.
---
 .ci/jenkins/Jenkinsfile.build-kogito-ci-image | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-kogito-ci-image b/.ci/jenkins/Jenkinsfile.build-kogito-ci-image
index a28714e04..a3c536d37 100644
--- a/.ci/jenkins/Jenkinsfile.build-kogito-ci-image
+++ b/.ci/jenkins/Jenkinsfile.build-kogito-ci-image
@@ -62,7 +62,6 @@ pipeline {
                 docker {
                     image env.IMAGE_NAME_TAG
                     args '--privileged --group-add docker'
-                    reuseNode true
                 }
             }
             steps {