Update saml-idp image using simplesamlphp 2.2.x

Author: back-2-95

misc/build.mk

@@ -24,3 +24,8 @@ misc-bake-test: misc-bake-all ## CI test for Misc images
 PHONY += misc-bake-localsolr
 misc-bake-localsolr: MISC_BAKE_FLAGS := solr --pull --progress plain --no-cache --push
 misc-bake-localsolr: misc-bake-all ## Bake all Misc images locally
+
+PHONY += misc-bake-idp
+#misc-bake-idp: MISC_BAKE_FLAGS := saml-idp --pull --progress plain --no-cache --load --set *.platform=linux/$(CURRENT_ARCH)
+misc-bake-idp: MISC_BAKE_FLAGS := saml-idp --pull --progress plain --no-cache --push
+misc-bake-idp: misc-bake-all ## Bake all Misc images locally

misc/docker-bake.hcl

@@ -1,6 +1,6 @@
 variable ALPINE_VERSION {}
 variable SIMPLESAMLPHP_VERSION {
-  default = "2.1.5"
+  default = "2.2.1"
 }
 
 group "default" {

misc/saml-idp/Dockerfile

@@ -1,9 +1,7 @@
 FROM alpine as simplesamlphp
 
 ARG SIMPLESAMLPHP_VERSION
-#ARG SIMPLESAMLPHP_URL=https://github.com/simplesamlphp/simplesamlphp/releases/download/v${SIMPLESAMLPHP_VERSION}/simplesamlphp-${SIMPLESAMLPHP_VERSION}.tar.gz
-# After 2.1.0
-ARG SIMPLESAMLPHP_URL=https://github.com/simplesamlphp/simplesamlphp/releases/download/v${SIMPLESAMLPHP_VERSION}/simplesamlphp-${SIMPLESAMLPHP_VERSION}.tar.gz
+ARG SIMPLESAMLPHP_URL=https://github.com/simplesamlphp/simplesamlphp/releases/download/v${SIMPLESAMLPHP_VERSION}/simplesamlphp-${SIMPLESAMLPHP_VERSION}-slim.tar.gz
 
 RUN apk --update --no-cache add curl
 RUN curl -s -L -o /tmp/simplesamlphp.tar.gz ${SIMPLESAMLPHP_URL}
@@ -21,8 +19,6 @@ RUN apk --update --no-cache add nginx && \
 # Copy SimpleSAMLphp
 COPY --from=simplesamlphp --chown=www-data /home/simplesamlphp /app/simplesamlphp
 
-RUN cd /app/simplesamlphp && php bin/translations translations:update:binary
-
 # Copy configuration files and scripts
 COPY --chown=www-data files/ /
 

misc/saml-idp/files/app/simplesamlphp/config/config.php

@@ -58,17 +58,19 @@
     /*
      * The following settings are *filesystem paths* which define where
      * SimpleSAMLphp can find or write the following things:
+     * - 'cachedir': Where SimpleSAMLphp can write its cache.
      * - 'loggingdir': Where to write logs. MUST be set to NULL when using a logging
      *                 handler other than `file`.
      * - 'datadir': Storage of general data.
      * - 'tempdir': Saving temporary files. SimpleSAMLphp will attempt to create
-     *   this directory if it doesn't exist.
+     *   this directory if it doesn't exist. DEPRECATED - replaced by cachedir.
      * When specified as a relative path, this is relative to the SimpleSAMLphp
      * root directory.
      */
+    'cachedir' => '/var/cache/simplesamlphp',
     //'loggingdir' => '/var/log/',
     //'datadir' => '/var/data/',
-    'tempdir' => '/tmp/simplesaml',
+    //'tempdir' => '/tmp/simplesamlphp',
 
     /*
      * Certificate and key material can be loaded from different possible
@@ -625,8 +627,10 @@
      * Set this to TRUE if the user only accesses your service
      * through https. If the user can access the service through
      * both http and https, this must be set to FALSE.
+     *
+     * If unset, SimpleSAMLphp will try to automatically determine the right value
      */
-    'session.cookie.secure' => true,
+    //'session.cookie.secure' => true,
 
     /*
      * Set the SameSite attribute in the cookie.