From 8afd7fc5c62d8ade6a55bf31d691d73821e1c48e Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Fri, 3 Aug 2018 16:53:15 -0400 Subject: [PATCH 1/4] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6abb497..fe64a5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,7 +112,7 @@ COPY --from=php-build /usr/local/lib/php /usr/local/lib/php/ COPY --from=php-build /usr/local/include/php /usr/local/include/php/ COPY --from=php-build /usr/local/bin /usr/local/bin/ -ARG COMANAGE_REGISTRY_VERSION +ARG COMANAGE_REGISTRY_VERSION=3.1.1 ARG COMANAGE_REGISTRY_SRC_URL=https://github.com/Internet2/comanage-registry/archive/${COMANAGE_REGISTRY_VERSION}.tar.gz ENV COMANAGE_REGISTRY_VERSION ${COMANAGE_REGISTRY_VERSION} From d7c81f201f33f6044de329101fb7446c8d3ca060 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Fri, 3 Aug 2018 16:54:37 -0400 Subject: [PATCH 2/4] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fe64a5f..7740dd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -191,7 +191,7 @@ COPY docker-supervisord-entrypoint /usr/local/bin/ # following line (to prevent other scripts from processing it). ##### ENV TIER_BEACON_OPT_OUT True -ENV TIER_RELEASE=180501 +ENV TIER_RELEASE=180801 ENV TIER_MAINTAINER=tier ENTRYPOINT ["docker-supervisord-entrypoint"] From c9f54b39823108e24bc7d17c82eb443b1a1d8d11 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Fri, 3 Aug 2018 16:55:55 -0400 Subject: [PATCH 3/4] Create Jenkinsfile --- Jenkinsfile | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..278e7f7 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,84 @@ +pipeline { + agent any + environment { + maintainer = "t" + imagename = 'g' + tag = 'l' + version='3.1.1' + } + stages { + stage('Setting build context') { + steps { + script { + maintainer = maintain() + imagename = imagename() + version= registryversion() + if(env.BRANCH_NAME == "master") { + tag = "latest" + } else { + tag = env.BRANCH_NAME + } + if(!imagename){ + echo "You must define an imagename in common.bash" + currentBuild.result = 'FAILURE' + } + } + } + } + stage('Build') { + steps { + echo 'step 2' + } + } + stage('Push') { + steps { + script { + docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") { + def baseImg = docker.build("$maintainer/$imagename", "--build-arg COMANAGE_REGISTRY_VERSION=$version .") + baseImg.push("$tag") + } + } + } + } + stage('Notify') { + steps{ + echo "$maintainer" + slackSend color: 'good', message: "$maintainer/$imagename:$tag pushed to DockerHub" + } + } + } + post { + always { + echo 'In post.' + } + failure { + // slackSend color: 'good', message: "Build failed" + handleError("BUILD ERROR: There was a problem building ${maintainer}/${imagename}:${tag}.") + } + } +} + + +def maintain() { + def matcher = readFile('common.bash') =~ 'maintainer="(.+)"' + matcher ? matcher[0][1] : 'tier' +} + +def imagename() { + def matcher = readFile('common.bash') =~ 'imagename="(.+)"' + matcher ? matcher[0][1] : null +} + +def registryversion() { + def matcher = readFile('common.bash') =~ 'COMANAGE_REGISTRY_VERSION="(.+)"' + matcher ? matcher[0][1] : null +} + + +def handleError(String message){ + echo "${message}" + currentBuild.setResult("FAILED") + slackSend color: 'danger', message: "${message}" + //step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'chubing@internet2.edu', sendToIndividuals: true]) + sh 'exit 1' +} From 2c64b9958d28f9da385e3e55509ab343b8f71f2c Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Fri, 3 Aug 2018 16:56:20 -0400 Subject: [PATCH 4/4] Create common.bash --- common.bash | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 common.bash diff --git a/common.bash b/common.bash new file mode 100644 index 0000000..5b0a486 --- /dev/null +++ b/common.bash @@ -0,0 +1,3 @@ +maintainer="tier" +imagename="comanage" +COMANAGE_REGISTRY_VERSION="3.1.1"