GRP-3710: shib library path fix

docker · Dec 6, 2021 · e9c1e24 · e9c1e24
1 parent 7b0b67f
commit e9c1e24
Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -112,10 +112,6 @@ RUN mkdir -p /opt/tier-support/originalFiles ; \
   cp /opt/tomee/conf/Catalina/localhost/grouper.xml /opt/tier-support/originalFiles 2>/dev/null ; \
   cp /opt/grouper/grouperWebapp/WEB-INF/web.xml /opt/tier-support/originalFiles 2>/dev/null
 
-# Export this variable so that shibd can find its CURL library
-RUN LD_LIBRARY_PATH="/opt/shibboleth/lib64"
-RUN export LD_LIBRARY_PATH
-
 WORKDIR /opt/grouper/grouperWebapp/WEB-INF/
 EXPOSE 80 443
 HEALTHCHECK NONE

diff --git a/container_files/tier-support/supervisord-shibsp.conf b/container_files/tier-support/supervisord-shibsp.conf
@@ -6,4 +6,4 @@ stderr_logfile_maxbytes=0
 stdout_logfile = /tmp/logshibd
 stdout_logfile_maxbytes=0
 
-
+environment=LD_LIBRARY_PATH=/opt/shibboleth/lib64
diff --git a/container_files/usr-local-bin/librarySetupFilesForProcess.sh b/container_files/usr-local-bin/librarySetupFilesForProcess.sh
@@ -50,7 +50,6 @@ setupFilesForProcess_shib() {
 
     if [ "$GROUPER_RUN_SHIB_SP" = "true" ]
       then
-        export LD_LIBRARY_PATH=/opt/shibboleth/lib64:$LD_LIBRARY_PATH
         echo "grouperContainer; INFO: (librarySetupFilesForProcess.sh-setupFilesForProcess_shib) Appending supervisord-shibsp.conf to supervisord.conf"
         cat /opt/tier-support/supervisord-shibsp.conf >> /opt/tier-support/supervisord.conf
         returnCode=$?