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 @@
+
+
+ fr.brouillard.oss
+ jgitver-maven-plugin
+ 1.9.0
+
+
\ 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 @@
org.springframework.boot
spring-boot-maven-plugin
+
+