From 151807900b0689d60377484ad0dfa94bb8326713 Mon Sep 17 00:00:00 2001
From: Oleg Mykolaishyn <owlleg6@Olegs-MacBook-Pro.local>
Date: Fri, 26 Mar 2021 11:44:16 +0200
Subject: [PATCH] working

---
 Jenkinsfile1 => Jenkinsfile | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)
 rename Jenkinsfile1 => Jenkinsfile (72%)

diff --git a/Jenkinsfile1 b/Jenkinsfile
similarity index 72%
rename from Jenkinsfile1
rename to Jenkinsfile
index b4b4ca08a..d2cdb71ee 100644
--- a/Jenkinsfile1
+++ b/Jenkinsfile
@@ -2,9 +2,9 @@
 
 pipeline {
     environment {
-        registry = "owlleg68/petclinic"
+        registry = "owlleg68/spring-petclinic"
         registryCredential = 'dockerhub_id'
-        dockerImage = 'spring-petclinic:2.4.2'
+        dockerImage = ''
     }
     
     agent {
@@ -34,24 +34,27 @@ pipeline {
             }
         }
 
-        stage('Build Docker image with Spring') {
+        stage('Build Docker image') {
             steps {
-                //script{
-                //    dockerImage = docker.build registry    
-                //}
-                sh 'mvn spring-boot:build-image'
+                script{
+                    dockerImage = docker.build registry    
+                }
+                //sh 'mvn spring-boot:build-image'
                 
             }
             
         }
             
         stage('Push Image') {
-            script {
-                docker.withRegistry( 'spring-petclinic:2.4.2', registryCredential ) {
-                dockerImage.push()
+            steps {
+                script {
+                    docker.withRegistry( '', registryCredential ) {
+                        dockerImage.push()
+                    }
+                }
             }
-        	}
-				}
+        }
+
 
         stage('Artifacts') {
             steps {