diff --git a/Dockerfile b/Dockerfile index edab89654d5250bcc3c1de5cfeefc7e08b26af51..c12321b2f94231b882516d20c7b0cc144f7f5579 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.git.autistici.org/ai3/docker/apache2-base:master +FROM registry.git.autistici.org/ai3/docker/apache2-base:bookworm COPY conf /tmp/conf COPY build.sh /tmp/build.sh diff --git a/build.sh b/build.sh index e1a54f6eb7b5c569678e51cfe71d14d26bf5b527..94e05fcb6e237f0c1522584a0391b4c99f4425a6 100755 --- a/build.sh +++ b/build.sh @@ -43,7 +43,7 @@ echo "export PHP_FPM_EXPORTER_PORT=\`expr \$APACHE_PORT + 200\`" >> /etc/apache2 # Enable php configuration. a2enmod proxy_fcgi setenvif -a2enconf -q php7.4-fpm +a2enconf -q php8.2-fpm # Rsync our configuration, on top of /etc. rsync -a /tmp/conf/ /etc/ diff --git a/conf/php/7.4/fpm/php-fpm.conf b/conf/php/7.4/fpm/php-fpm.conf deleted file mode 100644 index c112e6249f84389840d672269e4371252f8a1fec..0000000000000000000000000000000000000000 --- a/conf/php/7.4/fpm/php-fpm.conf +++ /dev/null @@ -1,6 +0,0 @@ -[global] -pid = /run/php/php7.4-fpm.pid -error_log = /dev/fd/2 -systemd_interval = 0 - -include=/etc/php/7.4/fpm/pool.d/*.conf diff --git a/conf/php/7.4/fpm/conf.d/50-container-openssl.ini b/conf/php/8.2/fpm/conf.d/50-container-openssl.ini similarity index 100% rename from conf/php/7.4/fpm/conf.d/50-container-openssl.ini rename to conf/php/8.2/fpm/conf.d/50-container-openssl.ini diff --git a/conf/php/8.2/fpm/php-fpm.conf b/conf/php/8.2/fpm/php-fpm.conf new file mode 100644 index 0000000000000000000000000000000000000000..cc2f6826c1188e7e66d532585975792e45a98cda --- /dev/null +++ b/conf/php/8.2/fpm/php-fpm.conf @@ -0,0 +1,6 @@ +[global] +pid = /run/php/php8.2-fpm.pid +error_log = /dev/fd/2 +systemd_interval = 0 + +include=/etc/php/8.2/fpm/pool.d/*.conf diff --git a/conf/php/7.4/fpm/pool.d/www.conf b/conf/php/8.2/fpm/pool.d/www.conf similarity index 95% rename from conf/php/7.4/fpm/pool.d/www.conf rename to conf/php/8.2/fpm/pool.d/www.conf index e56fed2c35b712fc713cdf23e045b31f5f786f94..ec0bc096433d0adbd8f60b07f956542c1cf02fed 100644 --- a/conf/php/7.4/fpm/pool.d/www.conf +++ b/conf/php/8.2/fpm/pool.d/www.conf @@ -1,5 +1,5 @@ [www] -listen = /run/php/php7.4-fpm.sock +listen = /run/php/php8.2-fpm.sock pm = dynamic pm.max_children = 20 diff --git a/conf/services.d/php-fpm-exporter/run b/conf/services.d/php-fpm-exporter/run index 170723d42ecb4023c349947ba17b7036573194c8..365ea35d9efe3533469aa07100ee27f16f354a74 100755 --- a/conf/services.d/php-fpm-exporter/run +++ b/conf/services.d/php-fpm-exporter/run @@ -1,4 +1,4 @@ #!/bin/sh . /etc/apache2/envvars export HOME=/ -exec /usr/sbin/php-fpm-exporter server "--phpfpm.scrape-uri=unix:///run/php/php7.4-fpm.sock;/status" --web.listen-address=:$PHP_FPM_EXPORTER_PORT --phpfpm.fix-process-count +exec /usr/sbin/php-fpm-exporter server "--phpfpm.scrape-uri=unix:///run/php/php8.2-fpm.sock;/status" --web.listen-address=:$PHP_FPM_EXPORTER_PORT --phpfpm.fix-process-count diff --git a/conf/services.d/php-fpm/run b/conf/services.d/php-fpm/run index 55fd8d5e14b1c4e8a9646a9473573fda11145d8c..14b9e83d8b42d334e27f0ef9285a29bf2c4dd33e 100755 --- a/conf/services.d/php-fpm/run +++ b/conf/services.d/php-fpm/run @@ -1,3 +1,3 @@ #!/bin/sh mkdir -p /run/php -exec /usr/sbin/php-fpm7.4 --force-stderr --nodaemonize +exec /usr/sbin/php-fpm8.2 --force-stderr --nodaemonize