2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-05-09 00:33:18 +02:00

Merge pull request #252 from ne20002/develop

Update to PHP 8.2
This commit is contained in:
Philipp Holzer 2024-08-23 23:04:36 +02:00 committed by GitHub
commit 30c1e742d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 18 additions and 8 deletions

View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # 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 # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -63,6 +63,8 @@ RUN set -ex; \
libtool \ libtool \
libmagick++-dev \ libmagick++-dev \
libmemcached-dev \ libmemcached-dev \
zlib1g-dev \
libssl-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6-dev \ libfreetype6-dev \
libwebp-dev \ libwebp-dev \

View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template # 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 # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \

View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # 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 # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -63,6 +63,8 @@ RUN set -ex; \
libtool \ libtool \
libmagick++-dev \ libmagick++-dev \
libmemcached-dev \ libmemcached-dev \
zlib1g-dev \
libssl-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6-dev \ libfreetype6-dev \
libwebp-dev \ libwebp-dev \

View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # 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 # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -63,6 +63,8 @@ RUN set -ex; \
libtool \ libtool \
libmagick++-dev \ libmagick++-dev \
libmemcached-dev \ libmemcached-dev \
zlib1g-dev \
libssl-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6-dev \ libfreetype6-dev \
libwebp-dev \ libwebp-dev \

View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template # 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 # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \

View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # 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 # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -63,6 +63,8 @@ RUN set -ex; \
libtool \ libtool \
libmagick++-dev \ libmagick++-dev \
libmemcached-dev \ libmemcached-dev \
zlib1g-dev \
libssl-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6-dev \ libfreetype6-dev \
libwebp-dev \ libwebp-dev \

View file

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

View file

@ -2,7 +2,7 @@
set -eo pipefail set -eo pipefail
declare -A php_version=( declare -A php_version=(
[default]='8.1' [default]='8.2'
) )
declare -A cmd=( declare -A cmd=(