From f3d59e489e54d92663c1b36be2a81e46a8eb8656 Mon Sep 17 00:00:00 2001
From: konsthol <konsthol@konsthol.eu>
Date: Tue, 27 May 2025 13:32:11 +0300
Subject: [PATCH] Does anyone read this? I'll be at the coffee shop accross the
 street.

---
 vars/buildAndDeploy.groovy                  |  4 ++--
 vars/unused/customDockerBuildAndPush.groovy | 14 --------------
 vars/unused/dockerBuildAndPush.groovy       | 14 --------------
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 vars/unused/customDockerBuildAndPush.groovy
 delete mode 100644 vars/unused/dockerBuildAndPush.groovy

diff --git a/vars/buildAndDeploy.groovy b/vars/buildAndDeploy.groovy
index b5eafdb..5629f96 100644
--- a/vars/buildAndDeploy.groovy
+++ b/vars/buildAndDeploy.groovy
@@ -1,6 +1,6 @@
 import com.example.DockerBuilder
 
-def call(String appName, String helmChartPath, String helmRepoName,String helmChartVersion, Boolean useCustomDocker, Boolean useInsecureRegistry) {
+def call(String appName, String helmChartPath, String helmRepoName,String helmChartVersion, Boolean useCustomDocker, Boolean useInsecureRegistry, Integer appPort) {
     def dockerBuilder = new DockerBuilder()
     def containerName = useCustomDocker ? 'custom-docker' : 'docker'
 
@@ -50,7 +50,7 @@ def call(String appName, String helmChartPath, String helmRepoName,String helmCh
                 helmChartVersion,
                 env.KUBERNETES_API,
                 env.KUBERNETES_TOKEN,
-                ["app.image": "localhost:31050/my-docker-repo/${appName}:latest", "app.ports.http": 8090, "app.secret": "nexus-secret"]
+                ["app.image": "localhost:31050/my-docker-repo/${appName}:latest", "app.ports.http": appPort, "app.secret": "nexus-secret"]
             )
         }
     }
diff --git a/vars/unused/customDockerBuildAndPush.groovy b/vars/unused/customDockerBuildAndPush.groovy
deleted file mode 100644
index 2fc3d18..0000000
--- a/vars/unused/customDockerBuildAndPush.groovy
+++ /dev/null
@@ -1,14 +0,0 @@
-def call(String dockerRepo, String imageName, String dockerfilePath, String buildContext, String nexusUser, String nexusPass) {
-    container('custom-docker') {
-        sh "dockerd &"
-        echo "Started Docker daemon"
-        sh "docker build -t ${imageName} -f ${dockerfilePath} ${buildContext}"
-        echo "Docker image ${imageName} built"
-        sh "docker login http://${dockerRepo} -u ${nexusUser} -p ${nexusPass}"
-        echo "Logging 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}"
-    }
-}
diff --git a/vars/unused/dockerBuildAndPush.groovy b/vars/unused/dockerBuildAndPush.groovy
deleted file mode 100644
index 1ff4e4e..0000000
--- a/vars/unused/dockerBuildAndPush.groovy
+++ /dev/null
@@ -1,14 +0,0 @@
-def call(String dockerRepo, String imageName, String dockerfilePath, String buildContext, String nexusUser, String nexusPass) {
-    container('docker') {
-        sh "dockerd --insecure-registry http://${dockerRepo} &"
-        echo "Started Docker daemon"
-        sh "docker build -t ${imageName} -f ${dockerfilePath} ${buildContext}"
-        echo "Docker image ${imageName} built"
-        sh "docker login http://${dockerRepo} -u ${nexusUser} -p ${nexusPass}"
-        echo "Logging 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}"
-    }
-}