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

Fix duplicate jre prefix.

master
Icedream 2018-05-07 20:38:21 +02:00
parent 828cc82bd5
commit 8660890a6f
Signed by: icedream
GPG Key ID: 1573F6D8EFE4D0CF
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -24,7 +24,7 @@ node("docker && linux && amd64") {
ansiColor { ansiColor {
def image = docker.build( def image = docker.build(
"${dockerNamespace}/${dockerBase}:tomcat${tomcatVersion}-jre${jreVersion}", "${dockerNamespace}/${dockerBase}:tomcat${tomcatVersion}-${jreVersion}",
"--build-arg TOMCAT_VERSION=${tomcatVersion} --build-arg JRE_VERSION=${jreVersion} .") "--build-arg TOMCAT_VERSION=${tomcatVersion} --build-arg JRE_VERSION=${jreVersion} .")
} }
@ -41,7 +41,7 @@ node("docker && linux && amd64") {
} }
} }
def imageTag = "${dockerNamespace}/${dockerBase}:${guacamoleVersion}-tomcat${tomcatVersion}-jre${jreVersion}" def imageTag = "${dockerNamespace}/${dockerBase}:${guacamoleVersion}-tomcat${tomcatVersion}-${jreVersion}"
images << [ image, imageFullName ] images << [ image, imageFullName ]
} }
} }