Skip to content

Debian Trixie #2454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
J0WI merged 1 commit into from
Aug 14, 2025
Merged

Debian Trixie #2454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions 30/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:8.3-apache-bookworm
FROM php:8.3-apache-trixie

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand All @@ -9,10 +9,10 @@ RUN set -ex; \
busybox-static \
bzip2 \
libldap-common \
libmagickcore-6.q16-6-extra \
libmagickcore-7.q16-10-extra \
rsync \
; \
rm -rf /var/lib/apt/lists/*; \
apt-get dist-clean; \
\
mkdir -p /var/spool/cron/crontabs; \
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
Expand Down Expand Up @@ -57,7 +57,6 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down Expand Up @@ -89,13 +88,14 @@ RUN set -ex; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| xargs -rt dpkg-query --search \
# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
| awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -rt apt-mark manual; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*
apt-get dist-clean

# set recommended PHP.ini settings
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
Expand Down Expand Up @@ -175,7 +175,7 @@ RUN set -ex; \
chmod +x /usr/src/nextcloud/occ; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/*
apt-get dist-clean

COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/
Expand Down
1 change: 0 additions & 1 deletion 30/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down
16 changes: 8 additions & 8 deletions 30/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:8.3-fpm-bookworm
FROM php:8.3-fpm-trixie

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand All @@ -9,10 +9,10 @@ RUN set -ex; \
busybox-static \
bzip2 \
libldap-common \
libmagickcore-6.q16-6-extra \
libmagickcore-7.q16-10-extra \
rsync \
; \
rm -rf /var/lib/apt/lists/*; \
apt-get dist-clean; \
\
mkdir -p /var/spool/cron/crontabs; \
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
Expand Down Expand Up @@ -57,7 +57,6 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down Expand Up @@ -89,13 +88,14 @@ RUN set -ex; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| xargs -rt dpkg-query --search \
# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
| awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -rt apt-mark manual; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*
apt-get dist-clean

# set recommended PHP.ini settings
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
Expand Down Expand Up @@ -160,7 +160,7 @@ RUN set -ex; \
chmod +x /usr/src/nextcloud/occ; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/*
apt-get dist-clean

COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/
Expand Down
16 changes: 8 additions & 8 deletions 31/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:8.3-apache-bookworm
FROM php:8.3-apache-trixie

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand All @@ -9,10 +9,10 @@ RUN set -ex; \
busybox-static \
bzip2 \
libldap-common \
libmagickcore-6.q16-6-extra \
libmagickcore-7.q16-10-extra \
rsync \
; \
rm -rf /var/lib/apt/lists/*; \
apt-get dist-clean; \
\
mkdir -p /var/spool/cron/crontabs; \
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
Expand Down Expand Up @@ -57,7 +57,6 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down Expand Up @@ -89,13 +88,14 @@ RUN set -ex; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| xargs -rt dpkg-query --search \
# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
| awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -rt apt-mark manual; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*
apt-get dist-clean

# set recommended PHP.ini settings
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
Expand Down Expand Up @@ -175,7 +175,7 @@ RUN set -ex; \
chmod +x /usr/src/nextcloud/occ; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/*
apt-get dist-clean

COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/
Expand Down
1 change: 0 additions & 1 deletion 31/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down
16 changes: 8 additions & 8 deletions 31/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:8.3-fpm-bookworm
FROM php:8.3-fpm-trixie

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand All @@ -9,10 +9,10 @@ RUN set -ex; \
busybox-static \
bzip2 \
libldap-common \
libmagickcore-6.q16-6-extra \
libmagickcore-7.q16-10-extra \
rsync \
; \
rm -rf /var/lib/apt/lists/*; \
apt-get dist-clean; \
\
mkdir -p /var/spool/cron/crontabs; \
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
Expand Down Expand Up @@ -57,7 +57,6 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down Expand Up @@ -89,13 +88,14 @@ RUN set -ex; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| xargs -rt dpkg-query --search \
# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
| awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -rt apt-mark manual; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*
apt-get dist-clean

# set recommended PHP.ini settings
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
Expand Down Expand Up @@ -160,7 +160,7 @@ RUN set -ex; \
chmod +x /usr/src/nextcloud/occ; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/*
apt-get dist-clean

COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/
Expand Down
1 change: 0 additions & 1 deletion Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down
14 changes: 7 additions & 7 deletions Dockerfile-debian.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ RUN set -ex; \
busybox-static \
bzip2 \
libldap-common \
libmagickcore-6.q16-6-extra \
libmagickcore-7.q16-10-extra \
rsync \
; \
rm -rf /var/lib/apt/lists/*; \
apt-get dist-clean; \
\
mkdir -p /var/spool/cron/crontabs; \
echo '*/%%CRONTAB_INT%% * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
Expand Down Expand Up @@ -56,7 +56,6 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down Expand Up @@ -88,13 +87,14 @@ RUN set -ex; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| xargs -rt dpkg-query --search \
# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
| awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -rt apt-mark manual; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*
apt-get dist-clean

# set recommended PHP.ini settings
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
Expand Down Expand Up @@ -159,7 +159,7 @@ RUN set -ex; \
chmod +x /usr/src/nextcloud/occ; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/*
apt-get dist-clean

COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/
Expand Down
2 changes: 1 addition & 1 deletion update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ declare -A alpine_version=(
)

declare -A debian_version=(
[default]='bookworm'
[default]='trixie'
)

declare -A php_version=(
Expand Down
8 changes: 4 additions & 4 deletions versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"apache": {
"variant": "apache",
"base": "debian",
"baseVersion": "bookworm",
"baseVersion": "trixie",
"phpVersion": "8.3"
},
"fpm": {
"variant": "fpm",
"base": "debian",
"baseVersion": "bookworm",
"baseVersion": "trixie",
"phpVersion": "8.3"
},
"fpm-alpine": {
Expand All @@ -34,13 +34,13 @@
"apache": {
"variant": "apache",
"base": "debian",
"baseVersion": "bookworm",
"baseVersion": "trixie",
"phpVersion": "8.3"
},
"fpm": {
"variant": "fpm",
"base": "debian",
"baseVersion": "bookworm",
"baseVersion": "trixie",
"phpVersion": "8.3"
},
"fpm-alpine": {
Expand Down
Loading