Fix scopes again.
parent
fadb0b61c0
commit
e36650d73d
|
@ -15,29 +15,27 @@ node("docker && linux && amd64") {
|
|||
}
|
||||
|
||||
stage("Build") {
|
||||
def imageVersion
|
||||
|
||||
versions.each { version ->
|
||||
def tomcatVersion = version[0]
|
||||
def jreVersion = version[1]
|
||||
def image
|
||||
|
||||
ansiColor {
|
||||
def tomcatVersion = version[0]
|
||||
def jreVersion = version[1]
|
||||
def image
|
||||
|
||||
image = docker.build(
|
||||
"${dockerNamespace}/${dockerBase}:tomcat${tomcatVersion}-${jreVersion}",
|
||||
"--build-arg TOMCAT_VERSION=${tomcatVersion} --build-arg TOMCAT_JRE=${jreVersion} .")
|
||||
}
|
||||
|
||||
def guacamoleVersion
|
||||
image.inside("-w /tmp") {
|
||||
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 guacamoleVersion
|
||||
image.inside("-w /tmp") {
|
||||
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()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue