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

Compare commits

base: icedream:828cc82bd5ef3c116cb5b2139ab6f1b492a52010
Branches Tags
icedream:master
...
compare: icedream:e2972fbf382ead8da293bd7d86883ce7f1b4335f
Branches Tags
icedream:master

2 Commits
828cc82bd5 ... e2972fbf38

Author SHA1 Message Date
Icedream e2972fbf38
Fix wrong build arg var for jre version. 2018-05-07 20:39:07 +02:00
Icedream 8660890a6f
Fix duplicate jre prefix. 2018-05-07 20:38:21 +02:00
1 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@ -24,8 +24,8 @@ node("docker && linux && amd64") {
ansiColor {
def image = docker.build(
"${dockerNamespace}/${dockerBase}:tomcat${tomcatVersion}-jre${jreVersion}",
"--build-arg TOMCAT_VERSION=${tomcatVersion} --build-arg JRE_VERSION=${jreVersion} .")
"${dockerNamespace}/${dockerBase}:tomcat${tomcatVersion}-${jreVersion}",
"--build-arg TOMCAT_VERSION=${tomcatVersion} --build-arg TOMCAT_JRE=${jreVersion} .")
}
def guacamoleVersion
@ -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 ]
}
}