friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-03-14 03:42:58 +01:00
Code Issues Releases Wiki Activity

Merge pull request #297 from ne20002/feat/bookworm

Browse source 
Upgraded the Debian version to bookworm
This commit is contained in:
ne20002 2025-03-05 09:12:05 +01:00 • committed by GitHub
commit 1c5859af82
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 68 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
2024.08/apache/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:8.2-apache-bullseye
FROM php:8.2-apache-bookworm
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
@ -75,7 +75,7 @@ RUN set -ex; \
libmagickcore-6.q16-6-extra \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \
--with-freetype \
@ -101,7 +101,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install apcu-5.1.24; \
pecl install memcached-3.3.0; \
pecl install redis-6.1.0; \
pecl install redis-6.1.0 --configureoptions 'enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
pecl install imagick-3.7.0; \
\
docker-php-ext-enable \
@ -110,12 +110,13 @@ RUN set -ex; \
redis \
imagick \
; \
rm -r /tmp/pear; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query -S \
| cut -d: -f1 \
@ -135,7 +136,9 @@ RUN set -ex; \
echo 'opcache.max_accelerated_files=10000'; \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidte_freq=1'; \
echo 'opcache.revalidte_freq=60'; \
echo 'opcache.jit=tracing'; \
echo 'opcache.jit_buffer_size=32M'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
\
{ \
@ -151,8 +154,7 @@ RUN set -ex; \
} > /usr/local/etc/php/conf.d/friendica.ini; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
RUN set -ex; \
a2enmod rewrite remoteip; \
RUN a2enmod headers rewrite remoteip; \
{ \
echo RemoteIPHeader X-Forwarded-For; \
echo RemoteIPTrustedProxy 127.0.0.0/8; \

2
2024.08/fpm-alpine/Dockerfile
View file

@ -131,7 +131,7 @@ RUN set -ex; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
RUN set -ex; \
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
echo access.format = '"%{REMOTE_ADDR}e - %u %t \"%m %r\" %s"' >> /usr/local/etc/php-fpm.d/docker.conf;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \

15
2024.08/fpm/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:8.2-fpm-bullseye
FROM php:8.2-fpm-bookworm
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
@ -75,7 +75,7 @@ RUN set -ex; \
libmagickcore-6.q16-6-extra \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \
--with-freetype \
@ -101,7 +101,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install apcu-5.1.24; \
pecl install memcached-3.3.0; \
pecl install redis-6.1.0; \
pecl install redis-6.1.0 --configureoptions 'enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
pecl install imagick-3.7.0; \
\
docker-php-ext-enable \
@ -110,12 +110,13 @@ RUN set -ex; \
redis \
imagick \
; \
rm -r /tmp/pear; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query -S \
| cut -d: -f1 \
@ -135,7 +136,9 @@ RUN set -ex; \
echo 'opcache.max_accelerated_files=10000'; \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidte_freq=1'; \
echo 'opcache.revalidte_freq=60'; \
echo 'opcache.jit=tracing'; \
echo 'opcache.jit_buffer_size=32M'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
\
{ \
@ -152,7 +155,7 @@ RUN set -ex; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
RUN set -ex; \
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
echo access.format = '"%{REMOTE_ADDR}e - %u %t \"%m %r\" %s"' >> /usr/local/etc/php-fpm.d/docker.conf;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \

16
2024.12/apache/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:8.2-apache-bullseye
FROM php:8.2-apache-bookworm
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
@ -75,7 +75,7 @@ RUN set -ex; \
libmagickcore-6.q16-6-extra \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \
--with-freetype \
@ -101,7 +101,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install apcu-5.1.24; \
pecl install memcached-3.3.0; \
pecl install redis-6.1.0; \
pecl install redis-6.1.0 --configureoptions 'enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
pecl install imagick-3.7.0; \
\
docker-php-ext-enable \
@ -110,12 +110,13 @@ RUN set -ex; \
redis \
imagick \
; \
rm -r /tmp/pear; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query -S \
| cut -d: -f1 \
@ -135,7 +136,9 @@ RUN set -ex; \
echo 'opcache.max_accelerated_files=10000'; \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidte_freq=1'; \
echo 'opcache.revalidte_freq=60'; \
echo 'opcache.jit=tracing'; \
echo 'opcache.jit_buffer_size=32M'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
\
{ \
@ -151,8 +154,7 @@ RUN set -ex; \
} > /usr/local/etc/php/conf.d/friendica.ini; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
RUN set -ex; \
a2enmod rewrite remoteip; \
RUN a2enmod headers rewrite remoteip; \
{ \
echo RemoteIPHeader X-Forwarded-For; \
echo RemoteIPTrustedProxy 127.0.0.0/8; \

2
2024.12/fpm-alpine/Dockerfile
View file

@ -131,7 +131,7 @@ RUN set -ex; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
RUN set -ex; \
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
echo access.format = '"%{REMOTE_ADDR}e - %u %t \"%m %r\" %s"' >> /usr/local/etc/php-fpm.d/docker.conf;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \

15
2024.12/fpm/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:8.2-fpm-bullseye
FROM php:8.2-fpm-bookworm
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
@ -75,7 +75,7 @@ RUN set -ex; \
libmagickcore-6.q16-6-extra \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \
--with-freetype \
@ -101,7 +101,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install apcu-5.1.24; \
pecl install memcached-3.3.0; \
pecl install redis-6.1.0; \
pecl install redis-6.1.0 --configureoptions 'enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
pecl install imagick-3.7.0; \
\
docker-php-ext-enable \
@ -110,12 +110,13 @@ RUN set -ex; \
redis \
imagick \
; \
rm -r /tmp/pear; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query -S \
| cut -d: -f1 \
@ -135,7 +136,9 @@ RUN set -ex; \
echo 'opcache.max_accelerated_files=10000'; \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidte_freq=1'; \
echo 'opcache.revalidte_freq=60'; \
echo 'opcache.jit=tracing'; \
echo 'opcache.jit_buffer_size=32M'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
\
{ \
@ -152,7 +155,7 @@ RUN set -ex; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
RUN set -ex; \
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
echo access.format = '"%{REMOTE_ADDR}e - %u %t \"%m %r\" %s"' >> /usr/local/etc/php-fpm.d/docker.conf;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \

16
2025.02-dev/apache/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:8.2-apache-bullseye
FROM php:8.2-apache-bookworm
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
@ -75,7 +75,7 @@ RUN set -ex; \
libmagickcore-6.q16-6-extra \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \
--with-freetype \
@ -101,7 +101,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install apcu-5.1.24; \
pecl install memcached-3.3.0; \
pecl install redis-6.1.0; \
pecl install redis-6.1.0 --configureoptions 'enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
pecl install imagick-3.7.0; \
\
docker-php-ext-enable \
@ -110,12 +110,13 @@ RUN set -ex; \
redis \
imagick \
; \
rm -r /tmp/pear; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query -S \
| cut -d: -f1 \
@ -135,7 +136,9 @@ RUN set -ex; \
echo 'opcache.max_accelerated_files=10000'; \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidte_freq=1'; \
echo 'opcache.revalidte_freq=60'; \
echo 'opcache.jit=tracing'; \
echo 'opcache.jit_buffer_size=32M'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
\
{ \
@ -151,8 +154,7 @@ RUN set -ex; \
} > /usr/local/etc/php/conf.d/friendica.ini; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
RUN set -ex; \
a2enmod rewrite remoteip; \
RUN a2enmod headers rewrite remoteip; \
{ \
echo RemoteIPHeader X-Forwarded-For; \
echo RemoteIPTrustedProxy 127.0.0.0/8; \

2
2025.02-dev/fpm-alpine/Dockerfile
View file

@ -131,7 +131,7 @@ RUN set -ex; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
RUN set -ex; \
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
echo access.format = '"%{REMOTE_ADDR}e - %u %t \"%m %r\" %s"' >> /usr/local/etc/php-fpm.d/docker.conf;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \

15
2025.02-dev/fpm/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:8.2-fpm-bullseye
FROM php:8.2-fpm-bookworm
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
@ -75,7 +75,7 @@ RUN set -ex; \
libmagickcore-6.q16-6-extra \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \
--with-freetype \
@ -101,7 +101,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install apcu-5.1.24; \
pecl install memcached-3.3.0; \
pecl install redis-6.1.0; \
pecl install redis-6.1.0 --configureoptions 'enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
pecl install imagick-3.7.0; \
\
docker-php-ext-enable \
@ -110,12 +110,13 @@ RUN set -ex; \
redis \
imagick \
; \
rm -r /tmp/pear; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query -S \
| cut -d: -f1 \
@ -135,7 +136,9 @@ RUN set -ex; \
echo 'opcache.max_accelerated_files=10000'; \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidte_freq=1'; \
echo 'opcache.revalidte_freq=60'; \
echo 'opcache.jit=tracing'; \
echo 'opcache.jit_buffer_size=32M'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
\
{ \
@ -152,7 +155,7 @@ RUN set -ex; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
RUN set -ex; \
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
echo access.format = '"%{REMOTE_ADDR}e - %u %t \"%m %r\" %s"' >> /usr/local/etc/php-fpm.d/docker.conf;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \

13
Dockerfile-debian.template
View file

@ -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; \
@ -74,7 +74,7 @@ RUN set -ex; \
libmagickcore-6.q16-6-extra \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \
--with-freetype \
@ -100,7 +100,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install apcu-%%APCU_VERSION%%; \
pecl install memcached-%%MEMCACHED_VERSION%%; \
pecl install redis-%%REDIS_VERSION%%; \
pecl install redis-%%REDIS_VERSION%% --configureoptions 'enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
pecl install imagick-%%IMAGICK_VERSION%%; \
\
docker-php-ext-enable \
@ -109,12 +109,13 @@ RUN set -ex; \
redis \
imagick \
; \
rm -r /tmp/pear; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query -S \
| cut -d: -f1 \
@ -134,7 +135,9 @@ RUN set -ex; \
echo 'opcache.max_accelerated_files=10000'; \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidte_freq=1'; \
echo 'opcache.revalidte_freq=60'; \
echo 'opcache.jit=tracing'; \
echo 'opcache.jit_buffer_size=32M'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
\
{ \

7
update.sh
View file

@ -18,8 +18,7 @@ declare -A base=(
)
declare -A extras=(
[apache]='RUN set -ex; \
a2enmod rewrite remoteip; \
[apache]='RUN a2enmod headers rewrite remoteip; \
{ \
echo RemoteIPHeader X-Forwarded-For; \
echo RemoteIPTrustedProxy 127.0.0.0/8; \
@ -29,9 +28,9 @@ declare -A extras=(
} > /etc/apache2/conf-available/remoteip.conf; \
a2enconf remoteip;'
[fpm]='RUN set -ex; \
echo access.format = '\''%{REMOTE_ADDR}e - %u %t \"%m %r\" %s'\'' >> /usr/local/etc/php-fpm.d/docker.conf;'
echo access.format = '\''\"%{REMOTE_ADDR}e - %u %t \\\"%m %r\\\" %s\"'\'' >> /usr/local/etc/php-fpm.d/docker.conf;'
[fpm-alpine]='RUN set -ex; \
echo access.format = '\''%{REMOTE_ADDR}e - %u %t \"%m %r\" %s'\'' >> /usr/local/etc/php-fpm.d/docker.conf;'
echo access.format = '\''\"%{REMOTE_ADDR}e - %u %t \\\"%m %r\\\" %s'\"\'' >> /usr/local/etc/php-fpm.d/docker.conf;'
)
declare -A entrypoints=(