Skip to content

Commit 901eec2

Browse files
committed
Upgrade PHP to 8.3
1 parent 1217148 commit 901eec2

3 files changed

Lines changed: 22 additions & 22 deletions

File tree

auth-proxy/Dockerfile

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ RUN set -x \
4343
&& apt-get update \
4444
&& apt-get -y --no-install-recommends --no-install-suggests install \
4545
nginx \
46-
php8.2-cli \
47-
php8.2-fpm \
48-
php8.2-common \
49-
php8.2-xml \
50-
php8.2-pgsql \
51-
php8.2-sqlite3 \
52-
&& php8.2 -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
53-
&& php8.2 -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;" \
54-
&& php8.2 composer-setup.php \
55-
&& php8.2 -r "unlink('composer-setup.php');" \
46+
php8.3-cli \
47+
php8.3-fpm \
48+
php8.3-common \
49+
php8.3-xml \
50+
php8.3-pgsql \
51+
php8.3-sqlite3 \
52+
&& php8.3 -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
53+
&& 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;" \
54+
&& php8.3 composer-setup.php \
55+
&& php8.3 -r "unlink('composer-setup.php');" \
5656
&& mv composer.phar /usr/local/bin/composer \
5757
&& chmod +x /usr/local/bin/composer \
5858
&& ln -sf /dev/stdout /var/log/nginx/access.log \
@@ -73,10 +73,10 @@ COPY resources/composer.json /var/www/composer.json
7373
RUN cd /var/www && composer install --no-dev
7474

7575
# Configure PHP settings
76-
RUN perl -pi -e 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php/8.2/fpm/php.ini && \
77-
perl -pi -e 's/allow_url_fopen = Off/allow_url_fopen = On/g' /etc/php/8.2/fpm/php.ini && \
78-
perl -pi -e 's/expose_php = On/expose_php = Off/g' /etc/php/8.2/fpm/php.ini && \
79-
perl -pi -e 's/;?\s*session\.gc_maxlifetime\s*=\s*.+/session.gc_maxlifetime = 10800/g' /etc/php/8.2/fpm/php.ini
76+
RUN perl -pi -e 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php/8.3/fpm/php.ini && \
77+
perl -pi -e 's/allow_url_fopen = Off/allow_url_fopen = On/g' /etc/php/8.3/fpm/php.ini && \
78+
perl -pi -e 's/expose_php = On/expose_php = Off/g' /etc/php/8.3/fpm/php.ini && \
79+
perl -pi -e 's/;?\s*session\.gc_maxlifetime\s*=\s*.+/session.gc_maxlifetime = 10800/g' /etc/php/8.3/fpm/php.ini
8080

8181
# Prepare nginx configuration
8282
RUN mkdir /etc/nginx/certs
@@ -111,11 +111,11 @@ RUN set -x \
111111
RUN set -x \
112112
&& apt-get update \
113113
&& apt-get -y --force-yes --no-install-recommends --no-install-suggests install \
114-
php8.2-curl \
115-
php8.2-mbstring \
116-
php8.2-gmp \
117-
php8.2-soap \
118-
php8.2-ldap \
114+
php8.3-curl \
115+
php8.3-mbstring \
116+
php8.3-gmp \
117+
php8.3-soap \
118+
php8.3-ldap \
119119
composer \
120120
&& cd /var/www/simplesamlphp \
121121
&& composer config repositories.attributeaggregator "{\"type\": \"vcs\", \"url\": \"${ATTRIBUTE_AGGREGATOR_URL}\", \"no-api\": true}" \

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ http {
8686

8787
location ~ [^/]\.php(/|$) {
8888
fastcgi_split_path_info ^(.+\.php)(/.*)$;
89-
fastcgi_pass unix:/run/php/php8.2-fpm.sock;
89+
fastcgi_pass unix:/run/php/php8.3-fpm.sock;
9090
include fastcgi_params;
9191
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
9292
fastcgi_param PATH_INFO $fastcgi_path_info;
@@ -98,7 +98,7 @@ http {
9898
alias /var/www/simplesamlphp/public;
9999

100100
location ~ ^(?<prefix>/simplesaml)(?<phpfile>.+?\.php)(?<pathinfo>/.*)?$ {
101-
fastcgi_pass unix:/run/php/php8.2-fpm.sock;
101+
fastcgi_pass unix:/run/php/php8.3-fpm.sock;
102102
fastcgi_index index.php;
103103
include fastcgi_params;
104104
fastcgi_param SCRIPT_FILENAME $document_root$phpfile;

auth-proxy/resources/supervisord.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ stderr_logfile=/dev/stderr
1818
stderr_logfile_maxbytes=0
1919

2020
[program:php-fpm]
21-
command = /usr/sbin/php-fpm8.2 --nodaemonize --fpm-config /etc/php/8.2/fpm/php-fpm.conf
21+
command = /usr/sbin/php-fpm8.3 --nodaemonize --fpm-config /etc/php/8.3/fpm/php-fpm.conf
2222
autostart=true
2323
autorestart=true
2424
priority=5

0 commit comments

Comments
 (0)