From 7dffa578828348b59fdd9eb4d9054b966d8e982e Mon Sep 17 00:00:00 2001
From: Jim Nicholson <thejimnicholson@gmail.com>
Date: Thu, 23 Dec 2021 14:00:50 -0800
Subject: [PATCH] Work on fixing versioning

---
 .mvn/extensions.xml |  8 ++++++++
 Jenkinsfile         | 20 ++++++++++++++++----
 pom.xml             |  2 ++
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 .mvn/extensions.xml

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 0000000..381852c
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,8 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+      <groupId>fr.brouillard.oss</groupId>
+    <artifactId>jgitver-maven-plugin</artifactId>
+    <version>1.9.0</version>
+  </extension>
+</extensions>
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 5a0124f..0e60948 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,6 @@
 
-def label = "mypod-${UUID.randomUUID().toString()}"
+def label = "servicedemo-${UUID.randomUUID().toString()}"
+
 podTemplate(label: label, containers: [
   containerTemplate(
     name: 'maven',
@@ -17,6 +18,10 @@ podTemplate(label: label, containers: [
   node(label) {
     stage('Checkout') {
       checkout scm
+      GIT_HASH = sh (
+        script: 'git rev-parse --short HEAD',
+        returnStdout: true
+      )
       container('maven') {
         stage('Build') {
           sh '''
@@ -30,9 +35,16 @@ podTemplate(label: label, containers: [
       container('kaniko') {
         stage('Image') {
           ansiColor('xterm') {
-           sh '''
-            /kaniko/executor -f `pwd`/Dockerfile -c `pwd` --insecure --skip-tls-verify --cache=true --destination=docker.home.thejimnicholson.com/servicedemo/test:latest
-           '''
+           sh "
+            /kaniko/executor \
+               -f `pwd`/Dockerfile \
+               -c `pwd` \
+               --insecure \
+               --skip-tls-verify \
+               --cache=true \
+               --destination=docker.home.thejimnicholson.com/servicedemo/servicedemo:${GIT_HASH} \
+               --destination=docker.home.thejimnicholson.com/servicedemo/servicedemo:latest
+           "
           }
         }
       }
diff --git a/pom.xml b/pom.xml
index 3ae4287..aca5d4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,8 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+
+
 		</plugins>
 	</build>