4.15.1

docker · Sep 9, 2024 · 707b74a · 707b74a
1 parent 96d51e5
commit 707b74a
Showing 3 changed files with 64 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,8 +9,8 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
 
 ARG GROUPER_CONTAINER_VERSION
 
-ENV GROUPER_VERSION=4.15.0 \
-    GROUPER_CONTAINER_VERSION=4.15.0 \
+ENV GROUPER_VERSION=4.15.1 \
+    GROUPER_CONTAINER_VERSION=4.15.1 \
     JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto \
     PATH=$PATH:$JAVA_HOME/bin \
     GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF

diff --git a/container_files/usr-local-bin/libraryPrep.sh b/container_files/usr-local-bin/libraryPrep.sh
@@ -438,20 +438,29 @@ prep_finishBegin() {
     fi
 
     if [ -z "$GROUPER_LOG_TO_HOST" ] ; then 
-      echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_LOG_TO_HOST=false"
+      echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_LOG_TO_HOST=false"
       export GROUPER_LOG_TO_HOST=false
     fi
     if [ -z "$GROUPER_LOG_TO_STDERR" ] ; then 
-      echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_LOG_TO_STDERR=false"
+      echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_LOG_TO_STDERR=false"
       export GROUPER_LOG_TO_STDERR=false
     fi
-
+
+    if [ -z "$GROUPER_PLAYWRIGHT_MOVE_JARS" ] ; then 
+      echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_PLAYWRIGHT_MOVE_JARS=false"
+      export GROUPER_PLAYWRIGHT_MOVE_JARS=false
+    fi
+    if [ -z "$GROUPER_PLAYWRIGHT_INSTALL_OS_LIBS" ] ; then 
+      echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_PLAYWRIGHT_INSTALL_OS_LIBS=false"
+      export GROUPER_PLAYWRIGHT_INSTALL_OS_LIBS=false
+    fi
+
     if [ -z "$GROUPER_LOG_TO_PIPE" ] ; then 
       if [ "$GROUPER_LOG_TO_HOST" = "true" ]; then
-        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_LOG_TO_PIPE=false"
+        echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_LOG_TO_PIPE=false"
         export GROUPER_LOG_TO_PIPE=false
       else
-        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_LOG_TO_PIPE=true"
+        echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_LOG_TO_PIPE=true"
         export GROUPER_LOG_TO_PIPE=true
       fi
     fi

diff --git a/container_files/usr-local-bin/librarySetupFilesForComponent.sh b/container_files/usr-local-bin/librarySetupFilesForComponent.sh
@@ -9,6 +9,11 @@ setupFilesForComponent_ws() {
        returnCode=$?
        echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ws) cp -r /opt/grouper/grouperWebapp/WEB-INF/libWs/* /opt/grouper/grouperWebapp/WEB-INF/lib/ , result: $returnCode"
        if [ $returnCode != 0 ]; then exit $returnCode; fi
+  else 
+    rm -rf /opt/grouper/grouperWebapp/docs
+    returnCode=$?
+    echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ws) rm -rf /opt/grouper/grouperWebapp/docs , result: $returnCode"
+    if [ $returnCode != 0 ]; then exit $returnCode; fi
   fi
 
 }
@@ -50,6 +55,39 @@ setupFilesForComponent_quickstart() {
 
 }
 
+setupFilesForComponent_playwrightJars() {
+  if [ "$GROUPER_PLAYWRIGHT_MOVE_JARS" = "true" ]
+     then
+       mv /opt/grouper/grouperWebapp/WEB-INF/libPlaywright/playwriight*.jar /opt/grouper/grouperWebapp/WEB-INF/lib/
+       returnCode=$?
+       echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_playwright) mv /opt/grouper/grouperWebapp/WEB-INF/libPlaywright/playwriight*.jar /opt/grouper/grouperWebapp/WEB-INF/lib/ , result: $returnCode"
+       if [ $returnCode != 0 ]; then exit $returnCode; fi
+  fi
+
+}
+
+
+setupFilesForComponent_playwrightInstallOsLibs() {
+  if [ "$GROUPER_PLAYWRIGHT_INSTALL_OS_LIBS" = "true" ]
+     then
+     setupFilesForComponent_playwrightInstallOsLibsHelper
+  fi
+
+}
+
+setupFilesForComponent_playwrightInstallOsLibsHelper() {
+
+  if [[ $EUID -ne 0 ]]; then
+     echo "grouperContainer; ERROR: (librarySetupFilesForComponent.sh-setupFilesForComponent_playwrightInstallOsLibsHelper) This script must be run as root" 
+     exit 1
+  fi
+
+  dnf -y install atk at-spi2-atk cups-libs libdrm at-spi2-core libX11 libXcomposite libXdamage libXext libXfixes libXrandr libgbm libxcb libxkbcommon pango cairo alsa-lib nspr nss libX11-xcb libXcursor gtk3 cairo-gobject gdk-pixbuf2 libicu libicu60 woff2 harfbuzz-icu enchant2 libsecret hyphen flite pcre libffi libevdev libglvnd-gles libicu-devel
+  returnCode=$?
+  echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_playwrightInstallOsLibsHelper) dnf -y install atk at-spi2-atk cups-libs libdrm at-spi2-core libX11 libXcomposite libXdamage libXext libXfixes libXrandr libgbm libxcb libxkbcommon pango cairo alsa-lib nspr nss libX11-xcb libXcursor gtk3 cairo-gobject gdk-pixbuf2 libicu libicu60 woff2 harfbuzz-icu enchant2 libsecret hyphen flite pcre libffi libevdev libglvnd-gles libicu-devel , result: $returnCode"
+  if [ $returnCode != 0 ]; then exit $returnCode; fi
+}
+
 setupFilesForComponent() {
 
   setupFilesForComponent_ws
@@ -58,6 +96,10 @@ setupFilesForComponent() {
 
   setupFilesForComponent_quickstart
 
+  setupFilesForComponent_playwrightJars
+
+  setupFilesForComponent_playwrightInstallOsLibs
+
 }
 
 
@@ -67,6 +109,9 @@ setupFilesForComponent_unsetAll() {
   unset -f setupFilesForComponent_ui
   unset -f setupFilesForComponent_unsetAll
   unset -f setupFilesForComponent_ws
+  unset -f setupFilesForComponent_playwrightJars
+  unset -f setupFilesForComponent_playwrightInstallOsLibs
+  unset -f setupFilesForComponent_playwrightInstallOsLibsHelper
 }
 
 setupFilesForComponent_exportAll() {
@@ -75,7 +120,9 @@ setupFilesForComponent_exportAll() {
   export -f setupFilesForComponent_ui
   export -f setupFilesForComponent_unsetAll
   export -f setupFilesForComponent_ws
-
+  export -f setupFilesForComponent_playwrightJars
+  export -f setupFilesForComponent_playwrightInstallOsLibs
+  export -f setupFilesForComponent_playwrightInstallOsLibsHelper
 }
 
 # export everything