From dd650e987d59565c44f826ad3ce0a4c39aeb19e1 Mon Sep 17 00:00:00 2001
From: hllvc <hllvc@icloud.com>
Date: Tue, 13 Jul 2021 17:40:45 +0200
Subject: [PATCH] another fix

---
 Dockerfile.build | 1 +
 Jenkinsfile      | 9 ++++-----
 build.sh         | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.build b/Dockerfile.build
index 2a412fa0f..d33d12522 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,4 +1,5 @@
 FROM openjdk:8-jdk-alpine
 WORKDIR /build
 CMD [ "./build.sh" ]
+RUN apk add bash git
 COPY build.sh .
diff --git a/Jenkinsfile b/Jenkinsfile
index 2930190a0..e43c2e6f2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
 					filename 'Dockerfile.build'
 					dir '.'
 					additionalBuildArgs '-t petclinic-build'
-					args '-v $HOME/.m2:/root/.m2 --name petclinic-build'
+					args '-v $HOME/.m2:/root/.m2'
 				}
 			}
 			steps {
@@ -24,14 +24,13 @@ pipeline {
 			agent {
 				docker {
 					image 'docker:dind'
-					args '-v /var/run/docker.sock:/var/run/docker.sock'
+					args '-v /var/run/docker.sock:/var/run/docker.sock --user root'
 				}
 			}
 			steps {
-				sh """docker run -d --rm \
+				sh """docker run -d \
 					-v /var/run/docker.sock:/var/run/docker.sock \
-					--name petclinic-build
-					petclinic-build"""
+					--name petclinic-build petclinic-build"""
 				sh 'docker cp petclinic-build:/build/target/app.jar .'
 			}
 		}
diff --git a/build.sh b/build.sh
index 4c415af54..556bfd8f9 100755
--- a/build.sh
+++ b/build.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-if [[ -f spring-petclinic ]]; then
+if [[ -e spring-petclinic ]]; then
 	cd spring-petclinic
-	git chekcout jenkins
+	git checkout jenkins
 	git pull jenkins
 else
 	git clone https://github.com/hllvc/spring-petclinic.git