Compare commits

..

No commits in common. "828cc82bd5ef3c116cb5b2139ab6f1b492a52010" and "e96cf56ca9cafaebc7e282d4bc40f736593998d1" have entirely different histories.

2 changed files with 12 additions and 16 deletions

View File

@ -32,7 +32,7 @@ ARG TOMCAT_JRE=jre8
FROM maven:3-jdk-8 AS builder
ARG GUACAMOLE_GIT_URL=https://github.com/apache/guacamole-client.git
ARG GUACAMOLE_VERSION=master
ARG GUACAMOLE_VERSION=latest
# Build environment variables
ENV \

6
Jenkinsfile vendored
View File

@ -22,15 +22,12 @@ node("docker && linux && amd64") {
def tomcatVersion = version[0]
def jreVersion = version[1]
ansiColor {
def guacamoleVersion
def image = docker.build(
"${dockerNamespace}/${dockerBase}:tomcat${tomcatVersion}-jre${jreVersion}",
"--build-arg TOMCAT_VERSION=${tomcatVersion} --build-arg JRE_VERSION=${jreVersion} .")
}
def guacamoleVersion
image.inside("-w /tmp") {
ansiColor {
sh """
unzip /opt/guacamole/guacamole.war META-INF/maven/org.apache.guacamole/guacamole/pom.properties
"""
@ -39,7 +36,6 @@ node("docker && linux && amd64") {
returnStdout: true,
).trim()
}
}
def imageTag = "${dockerNamespace}/${dockerBase}:${guacamoleVersion}-tomcat${tomcatVersion}-jre${jreVersion}"
images << [ image, imageFullName ]