Merge pull request #252 from ne20002/develop

Update to PHP 8.2
2025-01-28 18:26:35 +01:00 · 2024-08-23 23:04:36 +02:00 · 2024-08-23 23:04:36 +02:00 · 30c1e742d0
commit 30c1e742d0
parent d618969e07 69adf85d87
8 changed files with 18 additions and 8 deletions
--- a/2024.08/apache/Dockerfile
+++ b/2024.08/apache/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.1-apache-bullseye
+FROM php:8.2-apache-bookworm

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -63,6 +63,8 @@ RUN set -ex; \
        libtool \
        libmagick++-dev \
        libmemcached-dev \
+        zlib1g-dev \
+        libssl-dev \
        libgraphicsmagick1-dev \
        libfreetype6-dev \
        libwebp-dev \
--- a/2024.08/fpm-alpine/Dockerfile
+++ b/2024.08/fpm-alpine/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.1-fpm-alpine
+FROM php:8.2-fpm-alpine

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
--- a/2024.08/fpm/Dockerfile
+++ b/2024.08/fpm/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.1-fpm-bullseye
+FROM php:8.2-fpm-bookworm

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -63,6 +63,8 @@ RUN set -ex; \
        libtool \
        libmagick++-dev \
        libmemcached-dev \
+        zlib1g-dev \
+        libssl-dev \
        libgraphicsmagick1-dev \
        libfreetype6-dev \
        libwebp-dev \
--- a/2024.09-dev/apache/Dockerfile
+++ b/2024.09-dev/apache/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.1-apache-bullseye
+FROM php:8.2-apache-bookworm

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -63,6 +63,8 @@ RUN set -ex; \
        libtool \
        libmagick++-dev \
        libmemcached-dev \
+        zlib1g-dev \
+        libssl-dev \
        libgraphicsmagick1-dev \
        libfreetype6-dev \
        libwebp-dev \
--- a/2024.09-dev/fpm-alpine/Dockerfile
+++ b/2024.09-dev/fpm-alpine/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.1-fpm-alpine
+FROM php:8.2-fpm-alpine

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
--- a/2024.09-dev/fpm/Dockerfile
+++ b/2024.09-dev/fpm/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.1-fpm-bullseye
+FROM php:8.2-fpm-bookworm

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -63,6 +63,8 @@ RUN set -ex; \
        libtool \
        libmagick++-dev \
        libmemcached-dev \
+        zlib1g-dev \
+        libssl-dev \
        libgraphicsmagick1-dev \
        libfreetype6-dev \
        libwebp-dev \
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@ -1,4 +1,4 @@
-FROM php:%%PHP_VERSION%%-%%VARIANT%%-bullseye
+FROM php:%%PHP_VERSION%%-%%VARIANT%%-bookworm

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -62,6 +62,8 @@ RUN set -ex; \
        libtool \
        libmagick++-dev \
        libmemcached-dev \
+        zlib1g-dev \
+        libssl-dev \
        libgraphicsmagick1-dev \
        libfreetype6-dev \
        libwebp-dev \
--- a/update.sh
+++ b/update.sh
@ -2,7 +2,7 @@
 set -eo pipefail

 declare -A php_version=(
-  [default]='8.1'
+  [default]='8.2'
 )

 declare -A cmd=(