From 6e8bd997ab5b77dc5b32b5465b2ea5535770a2c3 Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Wed, 3 May 2017 15:39:23 -0400 Subject: [PATCH] Lots of new stuff --- src/edu/internet2/jenkins/DockerBuild.groovy | 20 +++++++++++++++++++- vars/buildDocker.groovy | 8 ++++++++ vars/imagename.groovy | 3 +++ vars/tag.groovy | 4 ++++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 vars/buildDocker.groovy create mode 100644 vars/imagename.groovy create mode 100644 vars/tag.groovy diff --git a/src/edu/internet2/jenkins/DockerBuild.groovy b/src/edu/internet2/jenkins/DockerBuild.groovy index e62fc6f..914ce4b 100644 --- a/src/edu/internet2/jenkins/DockerBuild.groovy +++ b/src/edu/internet2/jenkins/DockerBuild.groovy @@ -2,7 +2,25 @@ package edu.internet2; class DockerBuild { def steps - DockerBuild(steps){ this.steps = steps } + def env + DockerBuild(env){ this.env = env } + + def tag() { + 'latest' + } + + def imagename() { + readCommonBash('imagename') + } + + def maintainer() { + readCommonBash('maintainer') + } + + def readCommonBash(String key = 'maintainer') { + def matcher = readFile('common.bash') =~ (key + '="(.+)"') + matcher ? matcher[0][1] : 'null' + } def build(args){ diff --git a/vars/buildDocker.groovy b/vars/buildDocker.groovy new file mode 100644 index 0000000..624b7b7 --- /dev/null +++ b/vars/buildDocker.groovy @@ -0,0 +1,8 @@ +import edu.internet2.jenkins.DockerBuild + +def call(env){ + build = new DockerBuild(env) + echo build.maintainer() + echo build.imagename() + echo build.tag() +} \ No newline at end of file diff --git a/vars/imagename.groovy b/vars/imagename.groovy new file mode 100644 index 0000000..785dee0 --- /dev/null +++ b/vars/imagename.groovy @@ -0,0 +1,3 @@ +def call() { + readCommonBash('imagename') +} \ No newline at end of file diff --git a/vars/tag.groovy b/vars/tag.groovy new file mode 100644 index 0000000..73d6b46 --- /dev/null +++ b/vars/tag.groovy @@ -0,0 +1,4 @@ +def call(env){ + echo env + env.BRANCH_NAME +} \ No newline at end of file