icedream
/
docker-disguised-guacamole
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix scopes again.

master
Icedream 2018-05-07 20:47:20 +02:00
parent fadb0b61c0
commit e36650d73d
Signed by: icedream
GPG Key ID: 1573F6D8EFE4D0CF
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Jenkinsfile vendored
View File

@ -15,29 +15,27 @@ node("docker && linux && amd64") {
} }
stage("Build") { stage("Build") {
def imageVersion
versions.each { version -> versions.each { version ->
def tomcatVersion = version[0]
def jreVersion = version[1]
def image
ansiColor { ansiColor {
def tomcatVersion = version[0]
def jreVersion = version[1]
def image
image = docker.build( image = docker.build(
"${dockerNamespace}/${dockerBase}:tomcat${tomcatVersion}-${jreVersion}", "${dockerNamespace}/${dockerBase}:tomcat${tomcatVersion}-${jreVersion}",
"--build-arg TOMCAT_VERSION=${tomcatVersion} --build-arg TOMCAT_JRE=${jreVersion} .") "--build-arg TOMCAT_VERSION=${tomcatVersion} --build-arg TOMCAT_JRE=${jreVersion} .")
}
def guacamoleVersion
def guacamoleVersion image.inside("-w /tmp") {
image.inside("-w /tmp") { ansiColor {
ansiColor { sh """
sh """ unzip /opt/guacamole/guacamole.war META-INF/maven/org.apache.guacamole/guacamole/pom.properties
unzip /opt/guacamole/guacamole.war META-INF/maven/org.apache.guacamole/guacamole/pom.properties """
""" guacamoleVersion = sh(
guacamoleVersion = sh( script: "grep -Po '(?i)^version=\\K.+\\s*\$' META-INF/maven/org.apache.guacamole/guacamole/pom.properties",
script: "grep -Po '(?i)^version=\\K.+\\s*\$' META-INF/maven/org.apache.guacamole/guacamole/pom.properties", returnStdout: true,
returnStdout: true, ).trim()
).trim() }
} }
} }