diff --git a/Jenkinsfile b/Jenkinsfile index 48bc44d..2744b67 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,19 +22,23 @@ node("docker && linux && amd64") { def tomcatVersion = version[0] def jreVersion = version[1] + ansiColor { + def image = docker.build( + "${dockerNamespace}/${dockerBase}:tomcat${tomcatVersion}-jre${jreVersion}", + "--build-arg TOMCAT_VERSION=${tomcatVersion} --build-arg JRE_VERSION=${jreVersion} .") + } + def guacamoleVersion - def image = docker.build( - "${dockerNamespace}/${dockerBase}:tomcat${tomcatVersion}-jre${jreVersion}", - "--build-arg TOMCAT_VERSION=${tomcatVersion} --build-arg JRE_VERSION=${jreVersion} .") - image.inside("-w /tmp") { - sh """ - unzip /opt/guacamole/guacamole.war META-INF/maven/org.apache.guacamole/guacamole/pom.properties - """ - guacamoleVersion = sh( - script: "grep -Po '(?i)^version=\\K.+\\s*\$' META-INF/maven/org.apache.guacamole/guacamole/pom.properties", - returnStdout: true, - ).trim() + ansiColor { + sh """ + unzip /opt/guacamole/guacamole.war META-INF/maven/org.apache.guacamole/guacamole/pom.properties + """ + guacamoleVersion = sh( + script: "grep -Po '(?i)^version=\\K.+\\s*\$' META-INF/maven/org.apache.guacamole/guacamole/pom.properties", + returnStdout: true, + ).trim() + } } def imageTag = "${dockerNamespace}/${dockerBase}:${guacamoleVersion}-tomcat${tomcatVersion}-jre${jreVersion}"