From a5895aafca7084229f6b54de0bae71324ada9d60 Mon Sep 17 00:00:00 2001
From: themajerr <93267210+themajerr@users.noreply.github.com>
Date: Mon, 10 Jul 2023 12:29:16 +0200
Subject: [PATCH] Update Jenkinsfile - docker image creation & push

---
 Jenkinsfile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9858f8a3b..387204ddb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,22 +8,26 @@ pipeline {
                 sh './gradlew check'
             }
         }
+
         stage('PR - Test') {
             when { branch 'PR-*' }
             steps {
                 sh './gradlew test'
             }
         }
+
         stage('PR - Build') {
             when { branch 'PR-*' }
             steps {
-                sh './gradlew build'
+                sh './gradlew clean build'
             }
         }
-        stage('PR - Push') {
+
+        stage('PR - Build + Push') {
             when { branch 'PR-*' }
             steps { 
-                sh 'echo "<PLACEHOLDER>"'
+                sh 'docker build -t us-west3-docker.pkg.dev/playground-s-11-5cd45b0d/docker-registry/petclinic:$(git tag | tail -1)-$(git rev-parse --short HEAD)'
+                sh 'docker push us-west3-docker.pkg.dev/playground-s-11-5cd45b0d/docker-registry/petclinic'
             }
         }
         
@@ -33,12 +37,14 @@ pipeline {
                 sh 'echo "<create tag>"'
             }
         }
+
         stage('Main - tag the artifact') {
             when { branch 'main' }
             steps { 
                 sh 'echo "<tag artifact>"'
             }
         }
+
         stage('Main - push to repo') {
             when { branch 'main' }
             steps {