From 6d0e19efdb8c9b61662e268baaeae3475b2998eb Mon Sep 17 00:00:00 2001
From: hllvc <hllvc@icloud.com>
Date: Wed, 14 Jul 2021 00:50:46 +0200
Subject: [PATCH] completly rewriten Jenkinsfile

---
 Jenkinsfile | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6a6beadf8..f8f43b881 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,30 +5,21 @@ pipeline {
 	stages {
 
 		stage('Build') {
-			agent {
-				dockerfile {
-					filename 'Dockerfile.build'
-					dir '.'
-					additionalBuildArgs '-t petclinic-build'
-					args '-v $HOME/.m2:/root/.m2'
+			steps {
+				script {
+					docker build -f Dockerfile.build -t petclinic-build .
+					docker run -v $HOME/.m2:/root/.m2 --name petclinic-build petclinic-build
+					docker cp petclinic-build:/build/spring-petclinic/target/app.jar .
 				}
 			}
-			steps {
-				sh 'docker run -v $HOME/.m2:/root/.m2 --name petclinic-build petclinic-build'
-				sh 'docker cp petclinic-build:/build/spring-petclinic/target/app.jar .'
-			 }
 		}
 
 		stage('Run') {
-			agent {
-				dockerfile {
-					filename 'Dockerfile.run'
-					additionalBuildArgs '-t petclinic-run'
-				}
-			}
 			steps {
-				sh 'docker-compose up'
-				/* sh 'docker run -it --rm -p 8080:8080 petclinic-run' */
+				script {
+					docker build -f Dockerfile.run -t petclinic-run .
+					docker-compose up
+				}
 			}
 		}