From 501138cc47554834d097b0a459f761eefa73a37e Mon Sep 17 00:00:00 2001
From: AndrewBanin <60724426+AndrewBanin@users.noreply.github.com>
Date: Mon, 24 Jan 2022 21:41:52 -0500
Subject: [PATCH 01/25] Add jenkinsfile (#1)

* Added empty Jenkinsfile

* Modified Jenkinsfile

* Modified Jenkinsfile1

* Modified Jenkinsfile2

* Modified jenkinsfile3

* Modified jenkinsfile4

* Modified jenkinsfile5

* Modified jenkinsfile5

* Modified jenkinsfile5

* Modified jenkinsfile5

* Modified jenkinsfile5

* Modified jenkinsfile5

* Modified jenkinsfile5

* Modified jenkinsfile5

* Modified jenkinsfile5

* Modified jenkinsfile5

* Modified jenkinsfile5

* Modified jenkinsfile5
---
 Jenkinsfile | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 00000000000..df5f6ffc29f
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,24 @@
+pipeline{
+    agent any
+    tools {
+      maven 'Maven'
+    }
+    
+    stages{
+        stage('CONTINOUSDOWNLOAD'){
+            steps{
+                git credentialsId: 'Github_Token', 
+                    url: 'https://github.com/AndrewBanin/spring-petclinic.git'
+            }
+            
+        }
+        
+        stage('Maven Build'){
+            steps{
+                sh "mvn clean package"
+            }
+        }
+    }
+}
+
+

From 9018049f8bac150a9f5a0f38acd154fa8e6d3a26 Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Wed, 2 Feb 2022 23:10:00 -0500
Subject: [PATCH 02/25] Modified jenkinsfile6

---
 Jenkinsfile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index df5f6ffc29f..59b804065d5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,20 +5,22 @@ pipeline{
     }
     
     stages{
-        stage('CONTINOUSDOWNLOAD'){
+        stage('Maven Build'){
             steps{
-                git credentialsId: 'Github_Token', 
-                    url: 'https://github.com/AndrewBanin/spring-petclinic.git'
+                sh "mvn clean package"
             }
             
         }
         
-        stage('Maven Build'){
+        stage('Build Docker Image'){
             steps{
-                sh "mvn clean package"
+                 script {
+                  app = docker.build("spring-petclinic:${env.BUILD_ID}" )
+                  app.inside {
+                      sh 'builing petclinic'
+                  }
+                }
             }
         }
     }
 }
-
-

From e8d8a7c68d4f438e960c023e7a82ac3d6f8f75c2 Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Wed, 2 Feb 2022 23:19:20 -0500
Subject: [PATCH 03/25] Modified jenkinsfile6

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 59b804065d5..077e5d214e2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,11 +16,8 @@ pipeline{
             steps{
                  script {
                   app = docker.build("spring-petclinic:${env.BUILD_ID}" )
-                  app.inside {
-                      sh 'builing petclinic'
-                  }
                 }
             }
         }
     }
-}
+}
\ No newline at end of file

From 899c476deca62e4fa1a7128c35b47da8a45e5d7e Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Wed, 2 Feb 2022 23:29:20 -0500
Subject: [PATCH 04/25] add dockerfile

---
 Jenkinsfile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 077e5d214e2..463eb919d31 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,10 +1,4 @@
-pipeline{
-    agent any
-    tools {
-      maven 'Maven'
-    }
-    
-    stages{
+ stages{
         stage('Maven Build'){
             steps{
                 sh "mvn clean package"

From 669b655de34740e0d97ff6b6bb9f51f24107f1f0 Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Wed, 2 Feb 2022 23:39:32 -0500
Subject: [PATCH 05/25] add dockerfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 463eb919d31..65c12c4c460 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,4 +14,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

From 3465007e4a1b9ba5f4da61e30214ed11981a475a Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Wed, 2 Feb 2022 23:43:19 -0500
Subject: [PATCH 06/25] add dockerfile

---
 Jenkinsfile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 65c12c4c460..75e174a131e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,4 +1,10 @@
- stages{
+pipeline{
+    agent any
+    tools {
+      maven 'Maven'
+    }
+    
+    stages{
         stage('Maven Build'){
             steps{
                 sh "mvn clean package"
@@ -15,3 +21,4 @@
         }
     }
 }
+

From 2f9692b41297ce8c5971148b03f31f8e189394d3 Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Wed, 2 Feb 2022 23:49:17 -0500
Subject: [PATCH 07/25] add dockerfile

---
 Jenkinsfile | 3 +--
 dockerfile  | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 dockerfile

diff --git a/Jenkinsfile b/Jenkinsfile
index 75e174a131e..077e5d214e2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,5 +20,4 @@ pipeline{
             }
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/dockerfile b/dockerfile
new file mode 100644
index 00000000000..7d9479d2dfc
--- /dev/null
+++ b/dockerfile
@@ -0,0 +1,3 @@
+FROM openjdk:11
+COPY target/*.jar /spring-petclinic.jar
+CMD ["java", ""-jar" , "spring-petclinic.jar"]

From 273b93f7be0e77a59fe4981361cd98796063da66 Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Thu, 3 Feb 2022 22:53:41 -0500
Subject: [PATCH 08/25] add dockerfile

---
 Jenkinsfile | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 077e5d214e2..93b8841b67f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,9 @@ pipeline{
     tools {
       maven 'Maven'
     }
-    
+    environment {
+      DOCKER_TAG = getVersion()
+    }
     stages{
         stage('Maven Build'){
             steps{
@@ -12,12 +14,23 @@ pipeline{
             
         }
         
-        stage('Build Docker Image'){
+        stage('Docker Build'){
             steps{
-                 script {
-                  app = docker.build("spring-petclinic:${env.BUILD_ID}" )
-                }
+                sh "docker build . -t banina/AndrewBanin:${DOCKER_TAG}"
+                
             }
+            
         }
-    }
-}
\ No newline at end of file
+        stage('Docker Push'){
+            steps{
+                sh "docker login -u banina -p password"
+                sh "docker push banina/AndrewBanin:${DOCKER_TAG}"    
+            }
+            
+        }
+    }  
+}
+def getVersion(){
+    def commitHash = sh returnStdout: true, script: 'git rev-parse -- short HEAD'
+    return commitHash
+ }   
\ No newline at end of file

From b27f778b638a5a5ebdb90b0e498f44b10f380f5a Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Thu, 3 Feb 2022 22:57:22 -0500
Subject: [PATCH 09/25] add dockerfile

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 93b8841b67f..a8556ff1d7b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline{
         
         stage('Docker Build'){
             steps{
-                sh "docker build . -t banina/AndrewBanin:${DOCKER_TAG}"
+                sh "docker build . -t banina/andrewbanin:${DOCKER_TAG}"
                 
             }
             
@@ -24,7 +24,7 @@ pipeline{
         stage('Docker Push'){
             steps{
                 sh "docker login -u banina -p password"
-                sh "docker push banina/AndrewBanin:${DOCKER_TAG}"    
+                sh "docker push banina/andrewbanin:${DOCKER_TAG}"    
             }
             
         }

From de2f00e14e56d5d248599aeac34844a5c55b202b Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Thu, 3 Feb 2022 23:00:17 -0500
Subject: [PATCH 10/25] add dockerfile

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a8556ff1d7b..2a006348eb8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline{
         
         stage('Docker Build'){
             steps{
-                sh "docker build . -t banina/andrewbanin:${DOCKER_TAG}"
+                sh "docker build . -t banina/spring-clinic:${DOCKER_TAG}"
                 
             }
             
@@ -24,7 +24,7 @@ pipeline{
         stage('Docker Push'){
             steps{
                 sh "docker login -u banina -p password"
-                sh "docker push banina/andrewbanin:${DOCKER_TAG}"    
+                sh "docker push banina/spring-clinic:${DOCKER_TAG}"    
             }
             
         }

From 0e96343f1c6a5c2af6c83c08378c7042c6f5c5c0 Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Thu, 3 Feb 2022 23:19:02 -0500
Subject: [PATCH 11/25] add dockerfile

---
 Jenkinsfile | 55 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2a006348eb8..8f4483ff8ac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,8 +4,8 @@ pipeline{
       maven 'Maven'
     }
     environment {
-      DOCKER_TAG = getVersion()
-    }
+		DOCKERHUB_CREDENTIALS=credentials('docker-jenkins-connect')
+	}
     stages{
         stage('Maven Build'){
             steps{
@@ -13,24 +13,33 @@ pipeline{
             }
             
         }
-        
-        stage('Docker Build'){
-            steps{
-                sh "docker build . -t banina/spring-clinic:${DOCKER_TAG}"
-                
-            }
-            
-        }
-        stage('Docker Push'){
-            steps{
-                sh "docker login -u banina -p password"
-                sh "docker push banina/spring-clinic:${DOCKER_TAG}"    
-            }
-            
-        }
-    }  
-}
-def getVersion(){
-    def commitHash = sh returnStdout: true, script: 'git rev-parse -- short HEAD'
-    return commitHash
- }   
\ No newline at end of file
+
+		stage('Build') {
+
+			steps {
+				sh 'docker build -t banina/spring-clinic:latest .'
+			}
+		}
+
+		stage('Login') {
+
+			steps {
+				sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -u $DOCKERHUB_CREDENTIALS_USR --password-stdin'
+			}
+		}
+
+		stage('Push') {
+
+			steps {
+				sh 'docker push  banina/spring-clinic:latest'
+			}
+		}
+	}
+
+	post {
+		always {
+			sh 'docker logout'
+		}
+	}
+
+}
\ No newline at end of file

From 419568bf1a3677a1085db3df6b7848b74cdffe68 Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Thu, 3 Feb 2022 23:34:27 -0500
Subject: [PATCH 12/25] add dockerfile

---
 Jenkinsfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8f4483ff8ac..d3f8b027eef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,6 +5,7 @@ pipeline{
     }
     environment {
 		DOCKERHUB_CREDENTIALS=credentials('docker-jenkins-connect')
+        DOCKERUSER=banina
 	}
     stages{
         stage('Maven Build'){
@@ -14,14 +15,14 @@ pipeline{
             
         }
 
-		stage('Build') {
+		stage('Docker Build Petclinic') {
 
 			steps {
-				sh 'docker build -t banina/spring-clinic:latest .'
+				sh 'docker build -t $DOCKERUSER/spring-clinic:${BUILD_NUMBER}-dev .'
 			}
 		}
 
-		stage('Login') {
+		stage('Login to Docker HUB') {
 
 			steps {
 				sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -u $DOCKERHUB_CREDENTIALS_USR --password-stdin'
@@ -31,7 +32,7 @@ pipeline{
 		stage('Push') {
 
 			steps {
-				sh 'docker push  banina/spring-clinic:latest'
+				sh 'docker push  $DOCKERUSER/spring-clinic:${BUILD_NUMBER}-dev'
 			}
 		}
 	}
@@ -42,4 +43,4 @@ pipeline{
 		}
 	}
 
-}
\ No newline at end of file
+}

From dda4b29469d84d65822d043a9aa35074531ed9b1 Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Thu, 3 Feb 2022 23:36:43 -0500
Subject: [PATCH 13/25] add dockerfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index d3f8b027eef..1b2ee660bda 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,7 +5,7 @@ pipeline{
     }
     environment {
 		DOCKERHUB_CREDENTIALS=credentials('docker-jenkins-connect')
-        DOCKERUSER=banina
+        DOCKERUSER="banina"
 	}
     stages{
         stage('Maven Build'){

From 90a445b3fbdd3e58ee72fee58be7638b373cf6ca Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Thu, 3 Feb 2022 23:50:16 -0500
Subject: [PATCH 14/25] add dockerfile

---
 Jenkinsfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1b2ee660bda..8334fb697f0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline{
         }
 
 		stage('Docker Build Petclinic') {
-
+            
 			steps {
 				sh 'docker build -t $DOCKERUSER/spring-clinic:${BUILD_NUMBER}-dev .'
 			}
@@ -35,6 +35,11 @@ pipeline{
 				sh 'docker push  $DOCKERUSER/spring-clinic:${BUILD_NUMBER}-dev'
 			}
 		}
+        stage('Cleanup') {
+            steps{
+                sh "docker rmi $DOCKERUSER/spring-clinic:${BUILD_NUMBER}-dev"
+            }
+        }
 	}
 
 	post {

From 4f78346b19fd8976e7ab4a862e6d41581b11014d Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Thu, 3 Feb 2022 23:56:42 -0500
Subject: [PATCH 15/25] add dockerfile

---
 Jenkinsfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8334fb697f0..6bc8e5c2813 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,6 +8,11 @@ pipeline{
         DOCKERUSER="banina"
 	}
     stages{
+        stage('CleanWorkSpace'){
+            steps {
+                cleanWs()
+            }
+        }
         stage('Maven Build'){
             steps{
                 sh "mvn clean package"
@@ -16,7 +21,7 @@ pipeline{
         }
 
 		stage('Docker Build Petclinic') {
-            
+
 			steps {
 				sh 'docker build -t $DOCKERUSER/spring-clinic:${BUILD_NUMBER}-dev .'
 			}

From 24f93c63fd414a5cd15c39a147dd98d3f8d84c5e Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Fri, 4 Feb 2022 00:03:51 -0500
Subject: [PATCH 16/25] add dockerfile

---
 Jenkinsfile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6bc8e5c2813..cdce03f984c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,15 +4,10 @@ pipeline{
       maven 'Maven'
     }
     environment {
-		DOCKERHUB_CREDENTIALS=credentials('docker-jenkins-connect')
+		DOCKERHUB_CREDENTIALS=credentials('dockerhub_token')
         DOCKERUSER="banina"
 	}
     stages{
-        stage('CleanWorkSpace'){
-            steps {
-                cleanWs()
-            }
-        }
         stage('Maven Build'){
             steps{
                 sh "mvn clean package"
@@ -45,6 +40,11 @@ pipeline{
                 sh "docker rmi $DOCKERUSER/spring-clinic:${BUILD_NUMBER}-dev"
             }
         }
+        stage('CleanWorkSpace'){
+            steps {
+                cleanWs()
+            }
+        }
 	}
 
 	post {
@@ -54,3 +54,4 @@ pipeline{
 	}
 
 }
+

From 050c050ab233f1a3dcf253f84e85c54a25e04017 Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Fri, 4 Feb 2022 00:05:59 -0500
Subject: [PATCH 17/25] add dockerfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index cdce03f984c..95b05d7b9c7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,7 @@ pipeline{
       maven 'Maven'
     }
     environment {
-		DOCKERHUB_CREDENTIALS=credentials('dockerhub_token')
+		DOCKERHUB_CREDENTIALS=credentials('docker-jenkins-connect')
         DOCKERUSER="banina"
 	}
     stages{

From 20b6eb1d27c8d2156038e7820151ccbc37f160d6 Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Fri, 4 Feb 2022 19:37:51 -0500
Subject: [PATCH 18/25] add dockerfile

---
 Jenkinsfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 95b05d7b9c7..7558cdcac49 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,4 +54,3 @@ pipeline{
 	}
 
 }
-

From d665195b8a986ffbf3053a4c8450b692bb421ccc Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Mon, 7 Feb 2022 22:37:44 -0500
Subject: [PATCH 19/25] add dockerfile

---
 Jenkinsfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7558cdcac49..aff337bf5e3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,13 +8,19 @@ pipeline{
         DOCKERUSER="banina"
 	}
     stages{
+        stage('git checkout'){
+            steps{
+                git credentialsId: 'Github_Token', 
+                    url: 'https://github.com/AndrewBanin/spring-petclinic.git'
+            }
+            
+        }
         stage('Maven Build'){
             steps{
                 sh "mvn clean package"
             }
             
         }
-
 		stage('Docker Build Petclinic') {
 
 			steps {

From 474fe319b792b011509c1f7853fc779627cb767e Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Mon, 7 Feb 2022 22:46:32 -0500
Subject: [PATCH 20/25] add dockerfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index aff337bf5e3..b07a1925702 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,7 +24,7 @@ pipeline{
 		stage('Docker Build Petclinic') {
 
 			steps {
-				sh 'docker build -t $DOCKERUSER/spring-clinic:${BUILD_NUMBER}-dev .'
+				sh 'docker build -t $DOCKERUSER/spring-petclinic:${BUILD_NUMBER}-dev .'
 			}
 		}
 

From ea57311c7d8b60a6bc8c8a4d6d67ca5de974a05a Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Mon, 7 Feb 2022 22:51:10 -0500
Subject: [PATCH 21/25] add dockerfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index b07a1925702..aff337bf5e3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,7 +24,7 @@ pipeline{
 		stage('Docker Build Petclinic') {
 
 			steps {
-				sh 'docker build -t $DOCKERUSER/spring-petclinic:${BUILD_NUMBER}-dev .'
+				sh 'docker build -t $DOCKERUSER/spring-clinic:${BUILD_NUMBER}-dev .'
 			}
 		}
 

From 862dce7cf31c5707d20f3fbfc8923326ab4c0b6c Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Mon, 7 Feb 2022 23:13:16 -0500
Subject: [PATCH 22/25] add dockerfile

---
 Jenkinsfile | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index aff337bf5e3..cff6aa4fb77 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,13 +8,6 @@ pipeline{
         DOCKERUSER="banina"
 	}
     stages{
-        stage('git checkout'){
-            steps{
-                git credentialsId: 'Github_Token', 
-                    url: 'https://github.com/AndrewBanin/spring-petclinic.git'
-            }
-            
-        }
         stage('Maven Build'){
             steps{
                 sh "mvn clean package"
@@ -27,7 +20,6 @@ pipeline{
 				sh 'docker build -t $DOCKERUSER/spring-clinic:${BUILD_NUMBER}-dev .'
 			}
 		}
-
 		stage('Login to Docker HUB') {
 
 			steps {
@@ -52,7 +44,6 @@ pipeline{
             }
         }
 	}
-
 	post {
 		always {
 			sh 'docker logout'

From 2bdca3127cf312ac7fec31d3df395521db024882 Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Mon, 7 Feb 2022 23:17:54 -0500
Subject: [PATCH 23/25] add dockerfile

---
 Jenkinsfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index cff6aa4fb77..a015a9e1055 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,6 +13,12 @@ pipeline{
                 sh "mvn clean package"
             }
             
+        }
+        stage('git checkout'){
+            steps{
+                git credentialsId: 'Github_Token', 
+                    url: 'https://github.com/AndrewBanin/spring-petclinic.git'
+            }  
         }
 		stage('Docker Build Petclinic') {
 

From 4ca33bdbb5c9f72c7d8f86eacd55c02fd4a83e34 Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Wed, 9 Feb 2022 21:42:34 -0500
Subject: [PATCH 24/25] add dockerfile

---
 Jenkinsfile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a015a9e1055..a9469779294 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,19 +11,18 @@ pipeline{
         stage('Maven Build'){
             steps{
                 sh "mvn clean package"
-            }
-            
+            } 
         }
         stage('git checkout'){
             steps{
-                git credentialsId: 'Github_Token', 
+                git credentialsId: 'jenkins-github', 
                     url: 'https://github.com/AndrewBanin/spring-petclinic.git'
             }  
         }
 		stage('Docker Build Petclinic') {
 
 			steps {
-				sh 'docker build -t $DOCKERUSER/spring-clinic:${BUILD_NUMBER}-dev .'
+				sh 'docker build -t $DOCKERUSER/spring-petclinic:${BUILD_NUMBER}-dev .'
 			}
 		}
 		stage('Login to Docker HUB') {
@@ -36,12 +35,12 @@ pipeline{
 		stage('Push') {
 
 			steps {
-				sh 'docker push  $DOCKERUSER/spring-clinic:${BUILD_NUMBER}-dev'
+				sh 'docker push  $DOCKERUSER/spring-petclinic:${BUILD_NUMBER}-dev'
 			}
 		}
         stage('Cleanup') {
             steps{
-                sh "docker rmi $DOCKERUSER/spring-clinic:${BUILD_NUMBER}-dev"
+                sh "docker rmi $DOCKERUSER/spring-petclinic:${BUILD_NUMBER}-dev"
             }
         }
         stage('CleanWorkSpace'){

From 3924b050f72955d1d4585ea1593eb14c175c7f3e Mon Sep 17 00:00:00 2001
From: banina <andybanin@gmail.com>
Date: Wed, 9 Feb 2022 22:09:03 -0500
Subject: [PATCH 25/25] add dockerfile

---
 Jenkinsfile | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a9469779294..30a65f4a243 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,12 +12,6 @@ pipeline{
             steps{
                 sh "mvn clean package"
             } 
-        }
-        stage('git checkout'){
-            steps{
-                git credentialsId: 'jenkins-github', 
-                    url: 'https://github.com/AndrewBanin/spring-petclinic.git'
-            }  
         }
 		stage('Docker Build Petclinic') {