Merge branch 'REL1_43'

Author: ionparticle

Dockerfile

@@ -85,7 +85,7 @@ RUN EXTS=`curl https://extdist.wmflabs.org/dist/extensions/ | awk 'BEGIN { FS =
     && curl -Ls https://github.com/ubc/mediawiki-extensions-caliper/archive/v2.0.5.tar.gz | tar xz --strip=1 -C /var/www/html/extensions/caliper \
     && echo "Installing https://github.com/ubc/mediawiki-extensions-ubcauth/archive/REL1_43.tar.gz" \
     && mkdir -p /var/www/html/extensions/UBCAuth\
-    && curl -Ls https://github.com/ubc/mediawiki-extensions-ubcauth/archive/master.tar.gz | tar xz --strip=1 -C /var/www/html/extensions/UBCAuth \
+    && curl -Ls https://github.com/ubc/mediawiki-extensions-ubcauth/archive/REL1_43.tar.gz | tar xz --strip=1 -C /var/www/html/extensions/UBCAuth \
     && echo "Installing https://github.com/ubc/mediawiki-extensions-AutoCreatedUserRedirector/archive/master.tar.gz" \
     && mkdir -p /var/www/html/extensions/AutoCreatedUserRedirector \
     && curl -Ls https://github.com/ubc/mediawiki-extensions-AutoCreatedUserRedirector/archive/master.tar.gz | tar xz --strip=1 -C /var/www/html/extensions/AutoCreatedUserRedirector \

docker-compose.yml

@@ -38,7 +38,7 @@ services:
     volumes:
       - simplesamlphp:/var/www/simplesamlphp
       # dev cert, do not use for prod
-      - ./docker/simplesamlphp/sp/cert/:/var/www/simplesamlphp/cert/
+      - ./docker/simplesamlphp/sp/cert/:/var/www/simplesamlphp-base/cert/
     environment: &simplesamlphpVars
       SIMPLESAMLPHP_DEV: 1
       SIMPLESAMLPHP_MEMCACHED_SERVER: memcached

docker/simplesamlphp/idp/Dockerfile.idp

@@ -17,7 +17,7 @@ RUN chown www-data. simplesamlphp/ /var/cache/simplesamlphp
 USER www-data
 
 # Install simplesamlphp
-ARG SIMPLESAMLPHP_TAG=v2.2.1
+ARG SIMPLESAMLPHP_TAG=v2.4.2
 RUN git clone --branch $SIMPLESAMLPHP_TAG https://github.com/simplesamlphp/simplesamlphp.git
 WORKDIR /var/www/simplesamlphp
 

docker/simplesamlphp/sp/Dockerfile.sp

@@ -1,4 +1,4 @@
-FROM php:7.4-apache
+FROM php:8.3-apache
 WORKDIR /var/www
 
 # Install composer & php extension installer
@@ -17,7 +17,7 @@ USER www-data
 
 # Install simplesamlphp, note we're using an older version for compatibility
 # as the wiki simplesamlphp extension is in a php7 environment
-ARG SIMPLESAMLPHP_TAG=v2.0.13
+ARG SIMPLESAMLPHP_TAG=v2.4.2
 RUN git clone --branch $SIMPLESAMLPHP_TAG https://github.com/simplesamlphp/simplesamlphp.git simplesamlphp-base
 WORKDIR /var/www/simplesamlphp-base
 

docker/simplesamlphp/sp/custom-entrypoint

@@ -2,6 +2,7 @@
 set -e
 
 cd /var/www
+rm -rf simplesamlphp/* # only rm directory contents
 cp -urf simplesamlphp-base/* simplesamlphp/
 
 # run the cron job tagged startup, this grabs the IDP's metadata