[struts] branch docker-build updated: Avoids using tools and bases on the image only

[lu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch docker-build
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/docker-build by this push:
     new 40d7e52  Avoids using tools and bases on the image only
40d7e52 is described below

commit 40d7e52273296fc61c0916e1a3d253d795aaab3d
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Fri Aug 30 08:34:18 2019 +0200

    Avoids using tools and bases on the image only
---
 Jenkinsfile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e9da02f..77a4255 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,27 +10,21 @@ pipeline {
     timeout(80)
     disableConcurrentBuilds()
   }
-  tools {
-    jdk 'JDK 1.8 (latest)'
-  }
   triggers {
     pollSCM 'H/15 * * * *'
   }
-  environment {
-    MAVEN_OPTS = '-Xmx1024m -XX:MaxPermSize=256m'
-  }
   stages {
     stage('Docker build') {
       agent {
         docker {
           image 'maven:3-jdk-8-slim'
           args '-v $HOME/.m2:/root/.m2'
-          args '-e MAVEN_OPTS=$MAVEN_OPTS'
+          args '-e MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m"'
         }
       }
       steps {
         sh 'echo $JAVA_HOME'
-        sh 'echo $MAVEN_OPTS'
+        sh 'which java'
         sh '$JAVA_HOME/java -version'
         sh 'mvn -v'
         sh './mvnw clean test -DskipWiki'