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

6
Jenkinsfile vendored
View File

@ -15,18 +15,15 @@ node("docker && linux && amd64") {
} }
stage("Build") { stage("Build") {
def imageVersion
versions.each { version -> versions.each { version ->
ansiColor {
def tomcatVersion = version[0] def tomcatVersion = version[0]
def jreVersion = version[1] def jreVersion = version[1]
def image def image
ansiColor {
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") {
@ -40,6 +37,7 @@ node("docker && linux && amd64") {
).trim() ).trim()
} }
} }
}
def imageTag = "${dockerNamespace}/${dockerBase}:${guacamoleVersion}-tomcat${tomcatVersion}-${jreVersion}" def imageTag = "${dockerNamespace}/${dockerBase}:${guacamoleVersion}-tomcat${tomcatVersion}-${jreVersion}"
images << [ image, imageFullName ] images << [ image, imageFullName ]