From 7a6d5ca692d9dc7fac685909ebe7c5f08be7ef8b Mon Sep 17 00:00:00 2001
From: smerle33 <stephane.merle+jenkins@gmail.com>
Date: Thu, 24 Oct 2024 17:42:52 +0200
Subject: [PATCH 1/3] feat(jenkinsfile): split updatecli and dockerbuild

---
 Jenkinsfile_k8s       | 7 ++++++-
 Jenkinsfile_updatecli | 7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 Jenkinsfile_updatecli

diff --git a/Jenkinsfile_k8s b/Jenkinsfile_k8s
index 8fdadb1..c6afc38 100644
--- a/Jenkinsfile_k8s
+++ b/Jenkinsfile_k8s
@@ -1,2 +1,7 @@
 properties([buildDiscarder(logRotator(daysToKeepStr: '15'))])
-parallelDockerUpdatecli([imageName: 'customgeoipupdate', rebuildImageOnPeriodicJob: false, , updatecliConfig: [containerMemory: '1G'], buildDockerConfig : [targetplatforms: 'linux/amd64,linux/arm64']])
+buildDockerAndPublishImage('account-app', [
+    rebuildImageOnPeriodicJob: false,
+    automaticSemanticVersioning: true,
+    targetplatforms: 'linux/amd64,linux/arm64',
+    disablePublication: !infra.isInfra()
+])
diff --git a/Jenkinsfile_updatecli b/Jenkinsfile_updatecli
new file mode 100644
index 0000000..4ae15ea
--- /dev/null
+++ b/Jenkinsfile_updatecli
@@ -0,0 +1,7 @@
+if (env.BRANCH_IS_PRIMARY) {
+    // Only trigger a daily check on the principal branch
+    properties([pipelineTriggers([cron('@daily')])])
+    updatecli(action: 'apply')
+} else {
+    updatecli(action: 'diff')
+}

From a8ad6906f21308e3e4b572ae55af4a444edfaa90 Mon Sep 17 00:00:00 2001
From: smerle33 <stephane.merle+jenkins@gmail.com>
Date: Thu, 24 Oct 2024 17:52:19 +0200
Subject: [PATCH 2/3] name change

---
 Jenkinsfile_k8s | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile_k8s b/Jenkinsfile_k8s
index c6afc38..1f4b279 100644
--- a/Jenkinsfile_k8s
+++ b/Jenkinsfile_k8s
@@ -1,5 +1,5 @@
 properties([buildDiscarder(logRotator(daysToKeepStr: '15'))])
-buildDockerAndPublishImage('account-app', [
+buildDockerAndPublishImage('geoipupdate', [
     rebuildImageOnPeriodicJob: false,
     automaticSemanticVersioning: true,
     targetplatforms: 'linux/amd64,linux/arm64',

From 916cc8f3a6d924b98e4d49c2663d5b505c3a98ed Mon Sep 17 00:00:00 2001
From: smerle33 <stephane.merle+jenkins@gmail.com>
Date: Thu, 24 Oct 2024 17:59:58 +0200
Subject: [PATCH 3/3] revert changes, keep name change

---
 Jenkinsfile_k8s       | 14 ++++++++------
 Jenkinsfile_updatecli |  7 -------
 2 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 Jenkinsfile_updatecli

diff --git a/Jenkinsfile_k8s b/Jenkinsfile_k8s
index 1f4b279..725bdaa 100644
--- a/Jenkinsfile_k8s
+++ b/Jenkinsfile_k8s
@@ -1,7 +1,9 @@
 properties([buildDiscarder(logRotator(daysToKeepStr: '15'))])
-buildDockerAndPublishImage('geoipupdate', [
-    rebuildImageOnPeriodicJob: false,
-    automaticSemanticVersioning: true,
-    targetplatforms: 'linux/amd64,linux/arm64',
-    disablePublication: !infra.isInfra()
-])
+// buildDockerAndPublishImage('geoipupdate', [
+//     rebuildImageOnPeriodicJob: false,
+//     automaticSemanticVersioning: true,
+//     targetplatforms: 'linux/amd64,linux/arm64',
+//     disablePublication: !infra.isInfra()
+// ])
+
+parallelDockerUpdatecli([imageName: 'geoipupdate', rebuildImageOnPeriodicJob: false, , updatecliConfig: [containerMemory: '1G'], buildDockerConfig : [targetplatforms: 'linux/amd64,linux/arm64']])
diff --git a/Jenkinsfile_updatecli b/Jenkinsfile_updatecli
deleted file mode 100644
index 4ae15ea..0000000
--- a/Jenkinsfile_updatecli
+++ /dev/null
@@ -1,7 +0,0 @@
-if (env.BRANCH_IS_PRIMARY) {
-    // Only trigger a daily check on the principal branch
-    properties([pipelineTriggers([cron('@daily')])])
-    updatecli(action: 'apply')
-} else {
-    updatecli(action: 'diff')
-}