upgrade to mP version 4.1

Dockerfile

@@ -22,7 +22,6 @@ RUN rm /etc/shibboleth/sp-signing-key.pem /etc/shibboleth/sp-signing-cert.pem  /
 
 COPY container_files/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
 COPY container_files/httpd/conf/* /etc/httpd/conf.d/
-COPY container_files/shibboleth/* /etc/shibboleth/
 COPY container_files/usr-local-bin/* /usr/local/bin/
 COPY container_files/opt-tier/* /opt/tier/
 

container_files/usr-local-bin/start-midpoint.sh

@@ -8,6 +8,17 @@ function check () {
     fi
 }
 
+echo "Linking secrets"
+for filepath in /run/secrets/*; do
+  label_file=`basename $filepath`
+  if [ "$label_file" == "mp_shibboleth_sp_keys.jks" ]; then
+	if [ ! -d "/etc/pki/mp" ]; then
+		mkdir /etc/pki/mp
+	fi
+    ln -sf /run/secrets/mp_shibboleth_sp_keys.jks /etc/pki/mp/sp-shibboleth-keys.jks
+  fi
+done
+
 # These variables have reasonable defaults in Dockerfile. So we will _not_ supply defaults here.
 # The composer or user has to make sure they are well defined.
 
@@ -20,7 +31,6 @@ check REPO_PASSWORD_FILE
 check REPO_MISSING_SCHEMA_ACTION
 check REPO_UPGRADEABLE_SCHEMA_ACTION
 check MP_KEYSTORE_PASSWORD_FILE
-check SSO_HEADER
 check AJP_ENABLED
 check AJP_PORT
 
@@ -40,7 +50,6 @@ java -Xmx$MP_MEM_MAX -Xms$MP_MEM_INIT -Dfile.encoding=UTF8 \
        -Dmidpoint.logging.alt.enabled=true \
        -Dmidpoint.logging.alt.filename=/tmp/logmidpoint \
        -Dspring.profiles.active="`$MP_DIR/active-spring-profiles`" \
-       $(if [ "$AUTHENTICATION" = "shibboleth" ]; then echo "-Dauth.logout.url=$LOGOUT_URL -Dauth.sso.header=$SSO_HEADER"; fi) \
        -Dserver.tomcat.ajp.enabled=$AJP_ENABLED \
        -Dserver.tomcat.ajp.port=$AJP_PORT \
        -Dlogging.path=/tmp/logtomcat \

demo/grouper/.env

@@ -9,5 +9,4 @@ REPO_MISSING_SCHEMA_ACTION=create
 REPO_UPGRADEABLE_SCHEMA_ACTION=stop
 MP_MEM_MAX=2048m
 MP_MEM_INIT=1024m
-SSO_HEADER=uid
 TIMEZONE=UTC