Clean up directory where version meta is unpacked to before using.

master
Icedream 2018-05-07 20:49:32 +02:00
parent e36650d73d
commit 7a860b21c2
Signed by: icedream
GPG Key ID: 1573F6D8EFE4D0CF
1 changed files with 11 additions and 8 deletions

5
Jenkinsfile vendored
View File

@ -26,8 +26,10 @@ node("docker && linux && amd64") {
"--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() {
ansiColor { ansiColor {
dir("tmp") {
deleteDir()
sh """ sh """
unzip /opt/guacamole/guacamole.war META-INF/maven/org.apache.guacamole/guacamole/pom.properties unzip /opt/guacamole/guacamole.war META-INF/maven/org.apache.guacamole/guacamole/pom.properties
""" """
@ -38,6 +40,7 @@ node("docker && linux && amd64") {
} }
} }
} }
}
def imageTag = "${dockerNamespace}/${dockerBase}:${guacamoleVersion}-tomcat${tomcatVersion}-${jreVersion}" def imageTag = "${dockerNamespace}/${dockerBase}:${guacamoleVersion}-tomcat${tomcatVersion}-${jreVersion}"
images << [ image, imageFullName ] images << [ image, imageFullName ]