From 9abce3577d994aba02824aa58b5616246217d13a Mon Sep 17 00:00:00 2001
From: Jim Nicholson <thejimnicholson@gmail.com>
Date: Thu, 15 Dec 2022 04:21:44 -0800
Subject: [PATCH 1/5] Try to clean up this stuff

---
 Jenkinsfile | 2 +-
 pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 730614a..54b41df 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,7 @@ def label = "servicedemo-${UUID.randomUUID().toString()}"
 podTemplate(label: label, containers: [
   containerTemplate(
     name: 'maven',
-    image: 'maven:3.8.4-openjdk-11',
+    image: 'maven:3.8.4-openjdk-17',
     command: 'sleep',
     args: '30d'
   ),
diff --git a/pom.xml b/pom.xml
index aca5d4d..f1b3d28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<name>servicedemo</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 		<spring-cloud.version>2020.0.4</spring-cloud.version>
 		<spring-boot.build-image.imageName>servicedemo</spring-boot.build-image.imageName>
 	</properties>
-- 
2.45.2


From fcc32abcbf15405c1f9c17e51dedac07fb48bbaf Mon Sep 17 00:00:00 2001
From: Jim Nicholson <thejimnicholson@gmail.com>
Date: Thu, 15 Dec 2022 04:34:44 -0800
Subject: [PATCH 2/5] Forget about push for now

---
 Jenkinsfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 88fe46b..c7740ff 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -57,10 +57,7 @@ podTemplate(label: POD_LABEL, containers: [
                --insecure \
                --skip-tls-verify \
                --tarPath ./target/servicedemo-${POM_VERSION}.image.tar \
-               --destination=${REGISTRY}/servicedemo:${POM_VERSION} \
-               --destination=${REGISTRY}/servicedemo:${GIT_HASH} \
-               --destination=${REGISTRY}/servicedemo:latest"
-
+               --destination=${REGISTRY}/servicedemo:${GIT_HASH} 
           }
         }
         stage('Archive') {
-- 
2.45.2


From 14180f20eb1cade75dec40f8b85d39eedf282847 Mon Sep 17 00:00:00 2001
From: Jim Nicholson <thejimnicholson@gmail.com>
Date: Thu, 15 Dec 2022 04:40:39 -0800
Subject: [PATCH 3/5] REmove remote registry

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

diff --git a/Jenkinsfile b/Jenkinsfile
index c7740ff..779659b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -57,7 +57,7 @@ podTemplate(label: POD_LABEL, containers: [
                --insecure \
                --skip-tls-verify \
                --tarPath ./target/servicedemo-${POM_VERSION}.image.tar \
-               --destination=${REGISTRY}/servicedemo:${GIT_HASH} 
+               --destination=servicedemo:${GIT_HASH} 
           }
         }
         stage('Archive') {
-- 
2.45.2


From 85eaae3ee114017a83742dbb75dd9b187657da08 Mon Sep 17 00:00:00 2001
From: Jim Nicholson <thejimnicholson@gmail.com>
Date: Thu, 15 Dec 2022 04:45:05 -0800
Subject: [PATCH 4/5] Silly typo

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 779659b..23374a5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -57,7 +57,7 @@ podTemplate(label: POD_LABEL, containers: [
                --insecure \
                --skip-tls-verify \
                --tarPath ./target/servicedemo-${POM_VERSION}.image.tar \
-               --destination=servicedemo:${GIT_HASH} 
+               --destination=servicedemo:${GIT_HASH}"
           }
         }
         stage('Archive') {
-- 
2.45.2


From 8a7ba34b2465f95b8e839437189f5d5efaab1d7a Mon Sep 17 00:00:00 2001
From: Jim Nicholson <thejimnicholson@gmail.com>
Date: Thu, 15 Dec 2022 04:52:03 -0800
Subject: [PATCH 5/5] FIguring out the new kaniko options

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 23374a5..1ac2a43 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
 
 def POD_LABEL="servicedemo-${UUID.randomUUID().toString()}"
-def REGISTRY="docker.home.thejimnicholson.com/servicedemo"
+def REGISTRY="registry.thejimnicholson.com/servicedemo"
 def POM_VERSION="unknown"
 def MVN_OPTS="-B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
 
@@ -56,6 +56,7 @@ podTemplate(label: POD_LABEL, containers: [
                -c `pwd` \
                --insecure \
                --skip-tls-verify \
+               --no-push \
                --tarPath ./target/servicedemo-${POM_VERSION}.image.tar \
                --destination=servicedemo:${GIT_HASH}"
           }
-- 
2.45.2