[struts] branch docker-build updated: Defines JDK's related env variables

[lukaszlenart]

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 657512f  Defines JDK's related env variables
657512f is described below

commit 657512f5df79c23031c53b1f28ced38f1caffa2c
Author: Lukasz Lenart 
AuthorDate: Thu Aug 29 08:44:20 2019 +0200

Defines JDK's related env variables
---
 Jenkinsfile | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2b811db..832fa99 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,10 @@
 #!groovy
 pipeline {
-  agent none
+  agent {
+node {
+  label 'ubuntu'
+}
+  }
   options {
 buildDiscarder logRotator(daysToKeepStr: '14', numToKeepStr: '10')
 timeout(80)
@@ -8,7 +12,6 @@ pipeline {
   }
   tools {
 jdk 'JDK 1.8 (latest)'
-maven 'Maven 3 (latest)'
   }
   triggers {
 pollSCM 'H/15 * * * *'
@@ -22,9 +25,13 @@ pipeline {
 docker {
   image 'maven:3-alpine'
   args '-v $HOME/.m2:/root/.m2'
+  args '-e JAVA_HOME=$JAVA_HOME'
+  args '-e MAVEN_OPTS=$MAVEN_OPTS'
 }
   }
   steps {
+sh 'echo $JAVA_HOME'
+sh 'echo $MAVEN_OPTS'
 sh 'mvn -v'
 sh 'mvn clean test -DskipWiki'
   }

[struts] branch docker-build updated: Uses slim image instead of alpine

[lukaszlenart]

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 769db1e  Uses slim image instead of alpine
769db1e is described below

commit 769db1e220ecf94fa1f4ae6ea43da3bbaba5594f
Author: Lukasz Lenart 
AuthorDate: Thu Aug 29 08:56:08 2019 +0200

Uses slim image instead of alpine
---
 Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 832fa99..2f2ad59 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,9 +23,8 @@ pipeline {
 stage('Docker build') {
   agent {
 docker {
-  image 'maven:3-alpine'
+  image 'maven:3-jdk-8-slim'
   args '-v $HOME/.m2:/root/.m2'
-  args '-e JAVA_HOME=$JAVA_HOME'
   args '-e MAVEN_OPTS=$MAVEN_OPTS'
 }
   }