diff --git a/Dockerfile.run b/Dockerfile.run index c7765ed77..523ad39c5 100644 --- a/Dockerfile.run +++ b/Dockerfile.run @@ -2,4 +2,4 @@ FROM openjdk:8-jre-alpine WORKDIR /app EXPOSE 8080 CMD [ "java", "-jar", "-Dspring.profiles.active=mysql" ,"app.jar" ] -COPY /target/app.jar . +COPY app.jar . diff --git a/Jenkinsfile b/Jenkinsfile index 5434bd89b..6a6beadf8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,10 +2,6 @@ pipeline { agent any - environment { - BUILD_CONTAINER_ID='test' - } - stages { stage('Build') { @@ -14,16 +10,12 @@ pipeline { filename 'Dockerfile.build' dir '.' additionalBuildArgs '-t petclinic-build' - args '$HOME/.m2:/root/.m2' + args '-v $HOME/.m2:/root/.m2' } } steps { - sh 'docker run -v $HOME/.m2:/root/.m2 -d petclinic-build > id' - script { - BUILD_CONTAINER_ID = sh( - script: 'echo $(cat id)' - ).trim() - } + sh 'docker run -v $HOME/.m2:/root/.m2 --name petclinic-build petclinic-build' + sh 'docker cp petclinic-build:/build/spring-petclinic/target/app.jar .' } } @@ -35,7 +27,6 @@ pipeline { } } steps { - sh 'docker cp ${BUILD_CONTAINER_ID}:/build/target/app.jar .' sh 'docker-compose up' /* sh 'docker run -it --rm -p 8080:8080 petclinic-run' */ } diff --git a/build.sh b/build.sh index 556bfd8f9..7654ce06a 100755 --- a/build.sh +++ b/build.sh @@ -10,4 +10,4 @@ else git checkout jenkins fi -./mvnw package +./mvnw package -DskipTests