Merge pull request #54 from shingo78/feature/simplesamlphp-2.4_php-8.4

Upgrade SimpleSAMLphp to 2.4 and PHP to 8.4

Author: shingo78

auth-proxy/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:24.04
 
-ARG SIMPLESAMLPHP_VERSION="2.3.7"
+ARG SIMPLESAMLPHP_VERSION="2.4.4"
 ARG ATTRIBUTE_AGGREGATOR_URL="https://github.com/NII-cloud-operation/simplesamlphp-module-attributeaggregator"
 ARG ATTRIBUTE_AGGREGATOR_BRANCH="dev-2.x-gakunin-cloud-gateway"
 
@@ -43,16 +43,16 @@ RUN set -x \
     && apt-get update \
     && apt-get -y --no-install-recommends --no-install-suggests install \
         nginx \
-        php8.3-cli \
-        php8.3-fpm \
-        php8.3-common \
-        php8.3-xml \
-        php8.3-pgsql \
-        php8.3-sqlite3 \
-    && php8.3 -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-    && php8.3 -r "if (hash_file('sha384', 'composer-setup.php') === '$(curl -q https://composer.github.io/installer.sig)') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
-    && php8.3 composer-setup.php \
-    && php8.3 -r "unlink('composer-setup.php');" \
+        php8.4-cli \
+        php8.4-fpm \
+        php8.4-common \
+        php8.4-xml \
+        php8.4-pgsql \
+        php8.4-sqlite3 \
+    && php8.4 -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+    && php8.4 -r "if (hash_file('sha384', 'composer-setup.php') === '$(curl -q https://composer.github.io/installer.sig)') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+    && php8.4 composer-setup.php \
+    && php8.4 -r "unlink('composer-setup.php');" \
     && mv composer.phar /usr/local/bin/composer \
     && chmod +x /usr/local/bin/composer \
     && ln -sf /dev/stdout /var/log/nginx/access.log \
@@ -73,10 +73,10 @@ COPY resources/composer.json /var/www/composer.json
 RUN cd /var/www && composer install --no-dev
 
 # Configure PHP settings
-RUN perl -pi -e 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php/8.3/fpm/php.ini && \
-    perl -pi -e 's/allow_url_fopen = Off/allow_url_fopen = On/g' /etc/php/8.3/fpm/php.ini && \
-    perl -pi -e 's/expose_php = On/expose_php = Off/g' /etc/php/8.3/fpm/php.ini && \
-    perl -pi -e 's/;?\s*session\.gc_maxlifetime\s*=\s*.+/session.gc_maxlifetime = 10800/g' /etc/php/8.3/fpm/php.ini
+RUN perl -pi -e 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php/8.4/fpm/php.ini && \
+    perl -pi -e 's/allow_url_fopen = Off/allow_url_fopen = On/g' /etc/php/8.4/fpm/php.ini && \
+    perl -pi -e 's/expose_php = On/expose_php = Off/g' /etc/php/8.4/fpm/php.ini && \
+    perl -pi -e 's/;?\s*session\.gc_maxlifetime\s*=\s*.+/session.gc_maxlifetime = 10800/g' /etc/php/8.4/fpm/php.ini
 
 # Prepare nginx configuration
 RUN mkdir /etc/nginx/certs
@@ -111,11 +111,11 @@ RUN set -x \
 RUN set -x \
     && apt-get update \
     && apt-get -y --force-yes --no-install-recommends --no-install-suggests install \
-       php8.3-curl \
-       php8.3-mbstring \
-       php8.3-gmp \
-       php8.3-soap \
-       php8.3-ldap \
+       php8.4-curl \
+       php8.4-mbstring \
+       php8.4-gmp \
+       php8.4-soap \
+       php8.4-ldap \
        composer \
     && cd /var/www/simplesamlphp \
     && composer config repositories.attributeaggregator "{\"type\": \"vcs\", \"url\": \"${ATTRIBUTE_AGGREGATOR_URL}\", \"no-api\": true}" \

auth-proxy/resources/etc/templates/nginx.conf.j2

@@ -92,7 +92,7 @@ http {
 
         location ~ [^/]\.php(/|$) {
             fastcgi_split_path_info ^(.+\.php)(/.*)$;
-            fastcgi_pass unix:/run/php/php8.3-fpm.sock;
+            fastcgi_pass unix:/run/php/php8.4-fpm.sock;
             include fastcgi_params;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             fastcgi_param PATH_INFO $fastcgi_path_info;
@@ -104,7 +104,7 @@ http {
             alias /var/www/simplesamlphp/public;
 
             location ~ ^(?<prefix>/simplesaml)(?<phpfile>.+?\.php)(?<pathinfo>/.*)?$ {
-                fastcgi_pass unix:/run/php/php8.3-fpm.sock;
+                fastcgi_pass unix:/run/php/php8.4-fpm.sock;
                 fastcgi_index index.php;
                 include fastcgi_params;
                 fastcgi_param SCRIPT_FILENAME $document_root$phpfile;

auth-proxy/resources/supervisord.conf

@@ -18,7 +18,7 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [program:php-fpm]
-command = /usr/sbin/php-fpm8.3 --nodaemonize --fpm-config /etc/php/8.3/fpm/php-fpm.conf
+command = /usr/sbin/php-fpm8.4 --nodaemonize --fpm-config /etc/php/8.4/fpm/php-fpm.conf
 autostart=true
 autorestart=true
 priority=5