Merge branch 'master' of https://github.com/prawinkorvi/cloudfreak

4cf50a1a · root · 0c8e44d4 · 85a56149 · 4cf50a1a · 4cf50a1a
Commit 4cf50a1a authored Dec 14, 2019 by root
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Jenkinsfile Jenkinsfile +1 -1

Dockerfile docker/Dockerfile +1 -1

No files found.
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,7 +22,7 @@ pipeline {
        stage('Build docker image') {
           steps {
               script {         
-                 def customImage = docker.build('prawinkorvi/petclinic')
+                 def customImage = docker.build('prawinkorvi/petclinic' './docker')
                 docker.withRegistry('https://registry.hub.docker.com', 'dockerhub') {
                 customImage.push(versionnum+"."+"${env.BUILD_NUMBER}")
                 }                     

--- a/docker/Dockerfile
+++ b/docker/Dockerfile
 FROM openjdk:11.0.5-jdk
-COPY *.jar app.jar
+ADD *.jar app.jar
 ENTRYPOINT java -jar app.jar