From e984388c93de9820776642382b6ae4532836de9b Mon Sep 17 00:00:00 2001 From: Jj! Date: Wed, 22 Aug 2018 12:44:19 -0500 Subject: [PATCH 01/16] [NOISSUE] docker poc --- backend/Dockerfile | 9 +++++++++ backend/build.gradle | 11 +++++++++++ 2 files changed, 20 insertions(+) create mode 100644 backend/Dockerfile diff --git a/backend/Dockerfile b/backend/Dockerfile new file mode 100644 index 000000000..cec9c4c44 --- /dev/null +++ b/backend/Dockerfile @@ -0,0 +1,9 @@ +FROM gcr.io/distroless/java + +ARG JAR_FILE + +COPY ${JAR_FILE} app.jar + +EXPOSE 8080 + +CMD ["app.jar"] \ No newline at end of file diff --git a/backend/build.gradle b/backend/build.gradle index ca484d6cb..fc687b99d 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -5,6 +5,7 @@ plugins { id 'com.gorylenko.gradle-git-properties' version '1.4.21' id 'net.researchgate.release' version '2.6.0' id 'io.franzbecker.gradle-lombok' version '1.13' + id 'com.palantir.docker' version '0.20.1' } apply plugin: 'io.spring.dependency-management' @@ -206,4 +207,14 @@ jacocoTestReport { csv.enabled = false html.destination = file("${buildDir}/jacocoHtml") } +} + +tasks.docker.dependsOn tasks.build +docker { + name 'unicon/shibui' + tags 'latest' + pull true + noCache true + files tasks.bootWar.outputs + buildArgs(['JAR_FILE': 'shibui.war']) } \ No newline at end of file From 0b1800f24810e5010d39d9e9d05fcd283eb2440f Mon Sep 17 00:00:00 2001 From: Jj! Date: Thu, 13 Sep 2018 11:30:24 -0500 Subject: [PATCH 02/16] [SHIBUI-794] WIP --- Jenkinsfile | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..596c3147d --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,19 @@ +pipeline { + agent any + options { + disableConcurrentBuilds() + buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10')) + } + stages { + stage('Build') { + steps { + sh './gradlew clean build' + } + post { + always { + junit 'backend/build/test-results/**/*.xml' + } + } + } + } +} \ No newline at end of file From f15646f0cc695d444f58abf4d42332a163c1ea7f Mon Sep 17 00:00:00 2001 From: Jj! Date: Thu, 13 Sep 2018 11:56:47 -0500 Subject: [PATCH 03/16] [SHIBUI-794] WIP --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 596c3147d..531037dc0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,6 +12,7 @@ pipeline { post { always { junit 'backend/build/test-results/**/*.xml' + jacoco execPattern: '**/build/jacoco/test.exec' } } } From 7928889fbc1ecacd4a5fc09d64e058dcefa26d9d Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 14 Sep 2018 12:02:03 -0500 Subject: [PATCH 04/16] [SHIBUI-794] WIP --- Jenkinsfile | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 531037dc0..1fec50052 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,5 +16,36 @@ pipeline { } } } + stage('Build Docker images') { + when { + expression { + return GIT_BRANCH in ['master', 'SHIBUI-794'] + } + } + steps { + sh '''./gradlew docker + ''' + } + } + stage('Deploy') { + when { + expression { + return GIT_BRANCH in ['master', 'SHIBUI-794'] + } + } + steps { + sh ''' + docker run unicon/shibui + ''' + } + } + } + post { + failure { + step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])]) + } + success { + emailext body: '''${SCRIPT, template="groovy-text.template"}''', recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']], subject: '[SHIBUI] Build Success' + } } } \ No newline at end of file From e0048b35e9cefd53cba1c026a983c0922a7e35d2 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 14 Sep 2018 12:59:51 -0500 Subject: [PATCH 05/16] [SHIBUI-794] WIP --- .../MetadataResolversControllerIntegrationTests.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy index 69efa8133..59d24409e 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy @@ -178,7 +178,8 @@ class MetadataResolversControllerIntegrationTests extends Specification { where: resolverType | _ 'DynamicHttp' | _ - 'FileBacked' | _ + // TODO: fix + // 'FileBacked' | _ 'LocalDynamic' | _ 'ResourceBacked' | _ 'Filesystem' | _ From d341ab134d7fe8f02ab5ea220f21366b1e091d1c Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 14 Sep 2018 13:12:03 -0500 Subject: [PATCH 06/16] [SHIBUI-794] WIP --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1fec50052..1c3657f47 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { } steps { sh ''' - docker run unicon/shibui + docker run -d --restart unicon/shibui ''' } } From 2b3340d6cfc36ed8f7d07c6dc1899510a337b4a8 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 14 Sep 2018 13:23:34 -0500 Subject: [PATCH 07/16] [SHIBUI-794] WIP --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1c3657f47..33ea8a208 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,7 @@ pipeline { } } steps { - sh ''' - docker run -d --restart unicon/shibui + sh '''docker run -d --restart unicon/shibui ''' } } From 70179903a15c38738c60a2c68d07fec5344d70d9 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 14 Sep 2018 13:25:47 -0500 Subject: [PATCH 08/16] [SHIBUI-794] WIP --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 33ea8a208..86cb0bc33 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ pipeline { } } steps { - sh '''docker run -d --restart unicon/shibui + sh '''docker run -d --restart always unicon/shibui ''' } } From 8fa65d0eb4f127daa3e05a98fcb5e8de1eed0106 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 14 Sep 2018 13:32:14 -0500 Subject: [PATCH 09/16] [SHIBUI-794] WIP --- .../MetadataResolversControllerIntegrationTests.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy index 59d24409e..e9c7bac13 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy @@ -227,7 +227,8 @@ class MetadataResolversControllerIntegrationTests extends Specification { where: resolverType | _ 'DynamicHttp' | _ - 'FileBacked' | _ + // TODO: fix + // 'FileBacked' | _ 'LocalDynamic' | _ 'ResourceBacked' | _ 'Filesystem' | _ From 0d45c53731e836929f12cbc16c532338f7107488 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 14 Sep 2018 13:56:14 -0500 Subject: [PATCH 10/16] [SHIBUI-794] WIP --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 86cb0bc33..eb6e72ef4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,9 @@ pipeline { } } steps { - sh '''docker run -d --restart always unicon/shibui + sh ''' + docker stop shibui + docker run -d --restart always -t shibui unicon/shibui --spring.config.location=file:/etc/shibui ''' } } From 5058f48527d1274d0b5973d5b9a22184bfe51367 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 14 Sep 2018 14:18:31 -0500 Subject: [PATCH 11/16] [SHIBUI-794] WIP --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index eb6e72ef4..e1eaa66f9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,8 +35,8 @@ pipeline { } steps { sh ''' - docker stop shibui - docker run -d --restart always -t shibui unicon/shibui --spring.config.location=file:/etc/shibui + docker stop shibui || true + docker run -d --restart always -t shibui -p 8080:8080 unicon/shibui --spring.config.location=file:/etc/shibui ''' } } From 342ca41f0e9c3cff1b7c7e7ce90c65e646fc8936 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 14 Sep 2018 14:47:14 -0500 Subject: [PATCH 12/16] [SHIBUI-794] WIP --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e1eaa66f9..29089222d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ pipeline { steps { sh ''' docker stop shibui || true - docker run -d --restart always -t shibui -p 8080:8080 unicon/shibui --spring.config.location=file:/etc/shibui + docker run -d --restart always -t shibui -p 8080:8080 unicon/shibui:latest --spring.config.location=file:/etc/shibui ''' } } From f5646849e6fb4476e8e376ca8d728d8930d9c4a5 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 14 Sep 2018 14:53:27 -0500 Subject: [PATCH 13/16] [SHIBUI-794] WIP --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 29089222d..12179561c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,8 +35,8 @@ pipeline { } steps { sh ''' - docker stop shibui || true - docker run -d --restart always -t shibui -p 8080:8080 unicon/shibui:latest --spring.config.location=file:/etc/shibui + docker stop shibui || true && docker rm shibui || true + docker run -d --restart always --name shibui -p 8080:8080 unicon/shibui:latest --spring.config.location=file:/etc/shibui ''' } } From 927bf45b07ad9057b0445d91c3d01e6031c6f980 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 14 Sep 2018 15:06:14 -0500 Subject: [PATCH 14/16] [SHIBUI-794] WIP --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 12179561c..3d72e20ba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ pipeline { steps { sh ''' docker stop shibui || true && docker rm shibui || true - docker run -d --restart always --name shibui -p 8080:8080 unicon/shibui:latest --spring.config.location=file:/etc/shibui + docker run -d --restart always --name shibui -p 8080:8080 -v /etc/shibui/application.properties:/application.properties unicon/shibui:latest ''' } } From 17fc2f2072f4ee07eb3f9fe1ccf0c4872dba1daf Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 14 Sep 2018 15:40:21 -0500 Subject: [PATCH 15/16] [SHIBUI-794] WIP --- .../MetadataResolversControllerIntegrationTests.groovy | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy index e9c7bac13..69efa8133 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy @@ -178,8 +178,7 @@ class MetadataResolversControllerIntegrationTests extends Specification { where: resolverType | _ 'DynamicHttp' | _ - // TODO: fix - // 'FileBacked' | _ + 'FileBacked' | _ 'LocalDynamic' | _ 'ResourceBacked' | _ 'Filesystem' | _ @@ -227,8 +226,7 @@ class MetadataResolversControllerIntegrationTests extends Specification { where: resolverType | _ 'DynamicHttp' | _ - // TODO: fix - // 'FileBacked' | _ + 'FileBacked' | _ 'LocalDynamic' | _ 'ResourceBacked' | _ 'Filesystem' | _ From 3359872babbcc1dd35e3647a610b4d250fffa8e4 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 17 Sep 2018 09:29:48 -0500 Subject: [PATCH 16/16] [SHIBUI-794] cleanup --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3d72e20ba..73ca4bfdf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ pipeline { stage('Build Docker images') { when { expression { - return GIT_BRANCH in ['master', 'SHIBUI-794'] + return GIT_BRANCH in ['master'] } } steps { @@ -30,7 +30,7 @@ pipeline { stage('Deploy') { when { expression { - return GIT_BRANCH in ['master', 'SHIBUI-794'] + return GIT_BRANCH in ['master'] } } steps {