Disable multistage builds for Jenkins because of proxy issues

navikt · Feb 13, 2019 · 9e8093d · 9e8093d
1 parent 68eb6c3
commit 9e8093d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,11 @@
-FROM openjdk:11-jdk as builder
-WORKDIR /
-COPY . .
-RUN ./gradlew build shadowJar
+#FROM openjdk:11-jdk as builder
+#WORKDIR /
+#COPY . .
+#RUN ./gradlew build shadowJar
 
 FROM navikt/java:11
-COPY --from=builder /build/libs/pdfgen-*-all.jar app.jar
+#COPY --from=builder /build/libs/pdfgen-*-all.jar app.jar
+COPY build/libs/pdfgen-*-all.jar app.jar
 COPY fonts fonts
 COPY templates templates
 COPY resources resources

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -26,21 +26,18 @@ pipeline {
         }
         stage('build') {
             steps {
-                sh 'echo disabled'
-                //sh './gradlew build -x test'
+                sh './gradlew build -x test'
             }
         }
         stage('run tests (unit & intergration)') {
             steps {
-                sh 'echo disabled'
-                //sh './gradlew test'
-                //slackStatus status: 'passed'
+                sh './gradlew test'
+                slackStatus status: 'passed'
             }
         }
         stage('create uber jar') {
             steps {
-                sh 'echo disabled'
-                //sh './gradlew shadowJar'
+                sh './gradlew shadowJar'
             }
         }
         stage('push docker image') {