Merge pull request #252 from ne20002/develop

Update to PHP 8.2
friendica · Aug 23, 2024 · 30c1e74 · 30c1e74
2 parents d618969 + 69adf85
commit 30c1e74
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 8 deletions.
diff --git 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 \

diff --git 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; \

diff --git 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 \

diff --git 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 \

diff --git 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; \

diff --git 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 \

diff --git 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 \

diff --git 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=(