Skip to content
Permalink
Browse files

Merge branch 'master' of github.internet2.edu:docker/grouper into tes…

…t-changes
  • Loading branch information
John Gasper
John Gasper committed May 21, 2018
2 parents bbbda9d + 0b4ceb8 commit 825494af0b041edd4ffc2eb53e44ede0f42aa9f0
@@ -31,7 +31,7 @@ pipeline {
}
}
}
stage('Build') {
stage('Clean') {
steps {
script {
try{
@@ -45,11 +45,15 @@ pipeline {
}
}
}
stage('Push') {
stage('Build') {
steps {
script {
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
// test the environment
sh 'cd test-compose && ./compose.sh'
// bring down after testing
sh 'cd test-compose && docker-compose down'
baseImg.push("$tag")
}
}
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install

grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_104,grouper_v2_3_0_ui_patch_42,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_16
grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_106,grouper_v2_3_0_ui_patch_43,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_16

#### set this to true to try to use defaults for everything. Only things without default values will need to be set
grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true
@@ -4,6 +4,6 @@

prepDaemon

export GSH_JVMARGS="-DENV=$ENV -DUSERTOKEN=$USERTOKEN"
export GSH_JVMARGS="$GSH_JVMARGS -DENV=$ENV -DUSERTOKEN=$USERTOKEN"

exec bin/gsh -loader > /tmp/loggrouper
@@ -4,6 +4,6 @@

prepDaemon

export GSH_JVMARGS="-DENV=$ENV -DUSERTOKEN=$USERTOKEN"
export GSH_JVMARGS="$GSH_JVMARGS -DENV=$ENV -DUSERTOKEN=$USERTOKEN"

exec bin/gsh "$@" | tee /tmp/loggrouper
@@ -1,5 +1,5 @@
[General]
AdminDomain = example.edu
AdminDomain = internet2.edu
ConfigDirectoryAdminID = admin
ConfigDirectoryAdminPwd = admin
ConfigDirectoryLdapURL = ldap://localhost:389/o=NetscapeRoot
@@ -198,6 +198,9 @@ services:
ports:
- "389:389"
- "3306:3306"
volumes:
- grouper_mysql:/var/lib/mysql
- grouper_ldap:/var/lib/dirsrv


idp:
@@ -249,3 +252,10 @@ secrets:
file: ./configs-and-secrets/grouper/subject.properties
sp-key.pem:
file: ./configs-and-secrets/shibboleth/sp-key.pem


volumes:
grouper_mysql:
driver: local
grouper_ldap:
driver: local

0 comments on commit 825494a

Please sign in to comment.
You can’t perform that action at this time.