GRP-3698: allow GrouperSystem password to be set by env var in container

(not in quickstart mode)
docker · Nov 17, 2021 · 7b0b67f · 7b0b67f
1 parent a831574
commit 7b0b67f
Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/container_files/usr-local-bin/libraryPrep.sh b/container_files/usr-local-bin/libraryPrep.sh
@@ -44,8 +44,8 @@ prep_quickstart() {
       export GROUPER_RUN_SHIB_SP=false
     fi
     if [ -z "$GROUPER_AUTO_DDL_UPTOVERSION" ]; then
-      echo "grouperContainer; INFO: (libraryPrep.sh-prep_quickstart) export GROUPER_AUTO_DDL_UPTOVERSION='v2.5.*'"    
-      export GROUPER_AUTO_DDL_UPTOVERSION='v2.5.*'
+      echo "grouperContainer; INFO: (libraryPrep.sh-prep_quickstart) export GROUPER_AUTO_DDL_UPTOVERSION='v2.6.*'"    
+      export GROUPER_AUTO_DDL_UPTOVERSION='v2.6.*'
     fi
     if [ -z "$GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES" ]; then 
       echo "grouperContainer; INFO: (libraryPrep.sh-prep_quickstart) export GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES='0.0.0.0/0'"    

diff --git a/container_files/usr-local-bin/librarySetupFilesForComponent.sh b/container_files/usr-local-bin/librarySetupFilesForComponent.sh
@@ -39,7 +39,7 @@ setupFilesForComponent_ui() {
 
 setupFilesForComponent_quickstart() {
 
-    if [ ! -z "$GROUPERSYSTEM_QUICKSTART_PASS" ] && [ "$GROUPER_QUICKSTART" = 'true' ]
+    if [ ! -z "$GROUPERSYSTEM_QUICKSTART_PASS" ]
       then
         if [ "$GROUPER_UI_GROUPER_AUTH" = 'true' ]
           then