From d980c2a3c6488230011e7cf5f9b9b0f1ba04a2da Mon Sep 17 00:00:00 2001
From: konsthol <konsthol@konsthol.eu>
Date: Tue, 27 May 2025 12:13:44 +0300
Subject: [PATCH] mergeconflix is the new hottest Gaul on the block

---
 src/com/example/DockerBuilder.groovy | 44 ++++++++--------------------
 1 file changed, 12 insertions(+), 32 deletions(-)

diff --git a/src/com/example/DockerBuilder.groovy b/src/com/example/DockerBuilder.groovy
index 8c2e8e8..c962a2c 100644
--- a/src/com/example/DockerBuilder.groovy
+++ b/src/com/example/DockerBuilder.groovy
@@ -1,42 +1,22 @@
 package com.example
 
 class DockerBuilder {
-    def dockerBuildAndPush(String dockerRepo, String imageName, String dockerfilePath, String buildContext, String nexusUser, String nexusPass) {
-        container('docker') {
-            sh "dockerd --insecure-registry http://${dockerRepo} &"
-            echo "Started Docker daemon in container 'docker'"
+    def dockerBuildAndPush(String dockerRepo, String imageName, String dockerfilePath, String buildContext, String nexusUser, String nexusPass, Boolean useInsecureRegistry) {
+        def dockerdCommand = useInsecureRegistry ? "dockerd --insecure-registry http://${dockerRepo} &" : "dockerd &"
 
-            sh "docker build -t ${imageName} -f ${dockerfilePath} ${buildContext}"
-            echo "Docker image ${imageName} built"
+        sh "$dockerdCommand"
+        echo "Started Docker daemon${useInsecureRegistry ? ' with --insecure-registry' : ''}"
 
-            sh "docker login http://${dockerRepo} -u ${nexusUser} -p ${nexusPass}"
-            echo "Logged in to ${dockerRepo}"
+        sh "docker build -t ${imageName} -f ${dockerfilePath} ${buildContext}"
+        echo "Docker image ${imageName} built"
 
-            sh "docker tag ${imageName} ${dockerRepo}/my-docker-repo/${imageName}:latest"
-            echo "Image ${imageName} tagged"
+        sh "docker login http://${dockerRepo} -u ${nexusUser} -p ${nexusPass}"
+        echo "Logged in to ${dockerRepo}"
 
-            sh "docker push ${dockerRepo}/my-docker-repo/${imageName}:latest"
-            echo "Pushed Docker image ${imageName} to ${dockerRepo}"
-        }
-    }
+        sh "docker tag ${imageName} ${dockerRepo}/my-docker-repo/${imageName}:latest"
+        echo "Image ${imageName} tagged"
 
-    def customDockerBuildAndPush(String dockerRepo, String imageName, String dockerfilePath, String buildContext, String nexusUser, String nexusPass) {
-        container('custom-docker') {
-            sh "dockerd &"
-            echo "Started Docker daemon in container 'custom-docker'"
-
-            sh "docker build -t ${imageName} -f ${dockerfilePath} ${buildContext}"
-            echo "Docker image ${imageName} built"
-
-            sh "docker login http://${dockerRepo} -u ${nexusUser} -p ${nexusPass}"
-            echo "Logged in to ${dockerRepo}"
-
-            sh "docker tag ${imageName} ${dockerRepo}/my-docker-repo/${imageName}:latest"
-            echo "Image ${imageName} tagged"
-
-            sh "docker push ${dockerRepo}/my-docker-repo/${imageName}:latest"
-            echo "Pushed Docker image ${imageName} to ${dockerRepo}"
-
-        }
+        sh "docker push ${dockerRepo}/my-docker-repo/${imageName}:latest"
+        echo "Pushed Docker image ${imageName} to ${dockerRepo}"
     }
 }