diff --git a/src/edu/internet2/jenkins/DockerBuild.groovy b/src/edu/internet2/jenkins/DockerBuild.groovy index fc774f4..e14c8a1 100644 --- a/src/edu/internet2/jenkins/DockerBuild.groovy +++ b/src/edu/internet2/jenkins/DockerBuild.groovy @@ -3,7 +3,11 @@ package edu.internet2.jenkins; class DockerBuild implements Serializable { def steps def env - DockerBuild(env){ this.env = env } + def config + DockerBuild(env, config){ + this.env = env + this.config = config + } def tag() { 'latest' @@ -18,7 +22,7 @@ class DockerBuild implements Serializable { } def readCommonBash(String key = 'maintainer') { - def matcher = readFile('common.bash') =~ (key + '="(.+)"') + def matcher = config =~ (key + '="(.+)"') matcher ? matcher[0][1] : 'null' } diff --git a/vars/buildDocker.groovy b/vars/buildDocker.groovy index 624b7b7..15f66fd 100644 --- a/vars/buildDocker.groovy +++ b/vars/buildDocker.groovy @@ -1,7 +1,7 @@ import edu.internet2.jenkins.DockerBuild def call(env){ - build = new DockerBuild(env) + build = new DockerBuild(env, readFile('common.bash')) echo build.maintainer() echo build.imagename() echo build.tag()