From 9ec433409d1111887d88ecc783f689d2bc02d278 Mon Sep 17 00:00:00 2001
From: Jim Van Fleet <jim.van.fleet@levvel.io>
Date: Wed, 3 May 2017 15:44:40 -0400
Subject: [PATCH] Can't readfile up in the guts, fair enough
---
src/edu/internet2/jenkins/DockerBuild.groovy | 8 ++++++--
vars/buildDocker.groovy | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
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()