Skip to content

Commit 943e55d

Browse files
J0WIJ0WI
authored
Debian Trixie (#2454)
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
1 parent 9a78a34 commit 943e55d

File tree

10 files changed

+44
-47
lines changed

10 files changed

+44
-47
lines changed

‎30/apache/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
2-
FROM php:8.3-apache-bookworm
2+
FROM php:8.3-apache-trixie
33

44
# entrypoint.sh and cron.sh dependencies
55
RUN set -ex; \
@@ -9,10 +9,10 @@ RUN set -ex; \
99
busybox-static \
1010
bzip2 \
1111
libldap-common \
12-
libmagickcore-6.q16-6-extra \
12+
libmagickcore-7.q16-10-extra \
1313
rsync \
1414
; \
15-
rm -rf /var/lib/apt/lists/*; \
15+
apt-get dist-clean; \
1616
\
1717
mkdir -p /var/spool/cron/crontabs; \
1818
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
@@ -57,7 +57,6 @@ RUN set -ex; \
5757
gmp \
5858
intl \
5959
ldap \
60-
opcache \
6160
pcntl \
6261
pdo_mysql \
6362
pdo_pgsql \
@@ -89,13 +88,14 @@ RUN set -ex; \
8988
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
9089
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
9190
| sort -u \
92-
| xargs -r dpkg-query --search \
93-
| cut -d: -f1 \
91+
| xargs -rt dpkg-query --search \
92+
# 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)
93+
| awk 'sub(":$", "", $1) { print $1 }' \
9494
| sort -u \
9595
| xargs -rt apt-mark manual; \
9696
\
9797
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
98-
rm -rf /var/lib/apt/lists/*
98+
apt-get dist-clean
9999

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

180180
COPY *.sh upgrade.exclude /
181181
COPY config/* /usr/src/nextcloud/config/

‎30/fpm-alpine/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ RUN set -ex; \
5454
gmp \
5555
intl \
5656
ldap \
57-
opcache \
5857
pcntl \
5958
pdo_mysql \
6059
pdo_pgsql \

‎30/fpm/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
2-
FROM php:8.3-fpm-bookworm
2+
FROM php:8.3-fpm-trixie
33

44
# entrypoint.sh and cron.sh dependencies
55
RUN set -ex; \
@@ -9,10 +9,10 @@ RUN set -ex; \
99
busybox-static \
1010
bzip2 \
1111
libldap-common \
12-
libmagickcore-6.q16-6-extra \
12+
libmagickcore-7.q16-10-extra \
1313
rsync \
1414
; \
15-
rm -rf /var/lib/apt/lists/*; \
15+
apt-get dist-clean; \
1616
\
1717
mkdir -p /var/spool/cron/crontabs; \
1818
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
@@ -57,7 +57,6 @@ RUN set -ex; \
5757
gmp \
5858
intl \
5959
ldap \
60-
opcache \
6160
pcntl \
6261
pdo_mysql \
6362
pdo_pgsql \
@@ -89,13 +88,14 @@ RUN set -ex; \
8988
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
9089
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
9190
| sort -u \
92-
| xargs -r dpkg-query --search \
93-
| cut -d: -f1 \
91+
| xargs -rt dpkg-query --search \
92+
# 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)
93+
| awk 'sub(":$", "", $1) { print $1 }' \
9494
| sort -u \
9595
| xargs -rt apt-mark manual; \
9696
\
9797
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
98-
rm -rf /var/lib/apt/lists/*
98+
apt-get dist-clean
9999

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

165165
COPY *.sh upgrade.exclude /
166166
COPY config/* /usr/src/nextcloud/config/

‎31/apache/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
2-
FROM php:8.3-apache-bookworm
2+
FROM php:8.3-apache-trixie
33

44
# entrypoint.sh and cron.sh dependencies
55
RUN set -ex; \
@@ -9,10 +9,10 @@ RUN set -ex; \
99
busybox-static \
1010
bzip2 \
1111
libldap-common \
12-
libmagickcore-6.q16-6-extra \
12+
libmagickcore-7.q16-10-extra \
1313
rsync \
1414
; \
15-
rm -rf /var/lib/apt/lists/*; \
15+
apt-get dist-clean; \
1616
\
1717
mkdir -p /var/spool/cron/crontabs; \
1818
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
@@ -57,7 +57,6 @@ RUN set -ex; \
5757
gmp \
5858
intl \
5959
ldap \
60-
opcache \
6160
pcntl \
6261
pdo_mysql \
6362
pdo_pgsql \
@@ -89,13 +88,14 @@ RUN set -ex; \
8988
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
9089
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
9190
| sort -u \
92-
| xargs -r dpkg-query --search \
93-
| cut -d: -f1 \
91+
| xargs -rt dpkg-query --search \
92+
# 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)
93+
| awk 'sub(":$", "", $1) { print $1 }' \
9494
| sort -u \
9595
| xargs -rt apt-mark manual; \
9696
\
9797
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
98-
rm -rf /var/lib/apt/lists/*
98+
apt-get dist-clean
9999

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

180180
COPY *.sh upgrade.exclude /
181181
COPY config/* /usr/src/nextcloud/config/

‎31/fpm-alpine/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ RUN set -ex; \
5454
gmp \
5555
intl \
5656
ldap \
57-
opcache \
5857
pcntl \
5958
pdo_mysql \
6059
pdo_pgsql \

‎31/fpm/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
2-
FROM php:8.3-fpm-bookworm
2+
FROM php:8.3-fpm-trixie
33

44
# entrypoint.sh and cron.sh dependencies
55
RUN set -ex; \
@@ -9,10 +9,10 @@ RUN set -ex; \
99
busybox-static \
1010
bzip2 \
1111
libldap-common \
12-
libmagickcore-6.q16-6-extra \
12+
libmagickcore-7.q16-10-extra \
1313
rsync \
1414
; \
15-
rm -rf /var/lib/apt/lists/*; \
15+
apt-get dist-clean; \
1616
\
1717
mkdir -p /var/spool/cron/crontabs; \
1818
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
@@ -57,7 +57,6 @@ RUN set -ex; \
5757
gmp \
5858
intl \
5959
ldap \
60-
opcache \
6160
pcntl \
6261
pdo_mysql \
6362
pdo_pgsql \
@@ -89,13 +88,14 @@ RUN set -ex; \
8988
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
9089
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
9190
| sort -u \
92-
| xargs -r dpkg-query --search \
93-
| cut -d: -f1 \
91+
| xargs -rt dpkg-query --search \
92+
# 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)
93+
| awk 'sub(":$", "", $1) { print $1 }' \
9494
| sort -u \
9595
| xargs -rt apt-mark manual; \
9696
\
9797
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
98-
rm -rf /var/lib/apt/lists/*
98+
apt-get dist-clean
9999

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

165165
COPY *.sh upgrade.exclude /
166166
COPY config/* /usr/src/nextcloud/config/

‎Dockerfile-alpine.template‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ RUN set -ex; \
5353
gmp \
5454
intl \
5555
ldap \
56-
opcache \
5756
pcntl \
5857
pdo_mysql \
5958
pdo_pgsql \

‎Dockerfile-debian.template‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ RUN set -ex; \
88
busybox-static \
99
bzip2 \
1010
libldap-common \
11-
libmagickcore-6.q16-6-extra \
11+
libmagickcore-7.q16-10-extra \
1212
rsync \
1313
; \
14-
rm -rf /var/lib/apt/lists/*; \
14+
apt-get dist-clean; \
1515
\
1616
mkdir -p /var/spool/cron/crontabs; \
1717
echo '*/%%CRONTAB_INT%% * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
@@ -56,7 +56,6 @@ RUN set -ex; \
5656
gmp \
5757
intl \
5858
ldap \
59-
opcache \
6059
pcntl \
6160
pdo_mysql \
6261
pdo_pgsql \
@@ -88,13 +87,14 @@ RUN set -ex; \
8887
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
8988
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
9089
| sort -u \
91-
| xargs -r dpkg-query --search \
92-
| cut -d: -f1 \
90+
| xargs -rt dpkg-query --search \
91+
# 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)
92+
| awk 'sub(":$", "", $1) { print $1 }' \
9393
| sort -u \
9494
| xargs -rt apt-mark manual; \
9595
\
9696
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
97-
rm -rf /var/lib/apt/lists/*
97+
apt-get dist-clean
9898

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

164164
COPY *.sh upgrade.exclude /
165165
COPY config/* /usr/src/nextcloud/config/

‎update.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ declare -A alpine_version=(
66
)
77

88
declare -A debian_version=(
9-
[default]='bookworm'
9+
[default]='trixie'
1010
)
1111

1212
declare -A php_version=(

‎versions.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
"apache": {
99
"variant": "apache",
1010
"base": "debian",
11-
"baseVersion": "bookworm",
11+
"baseVersion": "trixie",
1212
"phpVersion": "8.3"
1313
},
1414
"fpm": {
1515
"variant": "fpm",
1616
"base": "debian",
17-
"baseVersion": "bookworm",
17+
"baseVersion": "trixie",
1818
"phpVersion": "8.3"
1919
},
2020
"fpm-alpine": {
@@ -34,13 +34,13 @@
3434
"apache": {
3535
"variant": "apache",
3636
"base": "debian",
37-
"baseVersion": "bookworm",
37+
"baseVersion": "trixie",
3838
"phpVersion": "8.3"
3939
},
4040
"fpm": {
4141
"variant": "fpm",
4242
"base": "debian",
43-
"baseVersion": "bookworm",
43+
"baseVersion": "trixie",
4444
"phpVersion": "8.3"
4545
},
4646
"fpm-alpine": {

0 commit comments

Comments
 (0)