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:e96cf56ca9cafaebc7e282d4bc40f736593998d1
Branches Tags
icedream:master

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

2 changed files with 12 additions and 16 deletions
Show Stats Expand all files Collapse all files

2
Dockerfile
View File

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

26
Jenkinsfile vendored
View File

@ -22,23 +22,19 @@ node("docker && linux && amd64") {
def tomcatVersion = version[0] def tomcatVersion = version[0]
def jreVersion = version[1] def jreVersion = version[1]
ansiColor {
def image = docker.build(
"${dockerNamespace}/${dockerBase}:tomcat${tomcatVersion}-jre${jreVersion}",
"--build-arg TOMCAT_VERSION=${tomcatVersion} --build-arg JRE_VERSION=${jreVersion} .")
}
def guacamoleVersion def guacamoleVersion
def image = docker.build(
"${dockerNamespace}/${dockerBase}:tomcat${tomcatVersion}-jre${jreVersion}",
"--build-arg TOMCAT_VERSION=${tomcatVersion} --build-arg JRE_VERSION=${jreVersion} .")
image.inside("-w /tmp") { image.inside("-w /tmp") {
ansiColor { 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 """
""" guacamoleVersion = sh(
guacamoleVersion = sh( script: "grep -Po '(?i)^version=\\K.+\\s*\$' META-INF/maven/org.apache.guacamole/guacamole/pom.properties",
script: "grep -Po '(?i)^version=\\K.+\\s*\$' META-INF/maven/org.apache.guacamole/guacamole/pom.properties", returnStdout: true,
returnStdout: true, ).trim()
).trim()
}
} }
def imageTag = "${dockerNamespace}/${dockerBase}:${guacamoleVersion}-tomcat${tomcatVersion}-jre${jreVersion}" def imageTag = "${dockerNamespace}/${dockerBase}:${guacamoleVersion}-tomcat${tomcatVersion}-jre${jreVersion}"