From 8660890a6f477346f94f33da4980eb7386d15045 Mon Sep 17 00:00:00 2001 From: Carl Kittelberger Date: Mon, 7 May 2018 20:38:21 +0200 Subject: [PATCH] Fix duplicate jre prefix. --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2744b67..f3d3d0b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ node("docker && linux && amd64") { ansiColor { 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} .") } @@ -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 ] } }