Skip to content

Commit 922c371

Browse files
trajanotrajano
authored
Merge branch 'nextcloud:master' into master
2 parents 61bd80a + 4cf9a20 commit 922c371

14 files changed

Lines changed: 56 additions & 55 deletions

File tree

‎.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ http {
1414
default_type application/octet-stream;
1515
types {
1616
text/javascript mjs;
17-
application/wasm wasm;
1817
}
1918

2019
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
@@ -39,8 +38,10 @@ http {
3938

4039
#gzip on;
4140

41+
resolver 127.0.0.11 valid=2s;
4242
upstream php-handler {
43-
server app:9000;
43+
zone backends 64k;
44+
server app:9000 resolve;
4445
}
4546

4647
server {

‎.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ http {
1414
default_type application/octet-stream;
1515
types {
1616
text/javascript mjs;
17-
application/wasm wasm;
1817
}
1918

2019
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
@@ -39,8 +38,10 @@ http {
3938

4039
#gzip on;
4140

41+
resolver 127.0.0.11 valid=2s;
4242
upstream php-handler {
43-
server app:9000;
43+
zone backends 64k;
44+
server app:9000 resolve;
4445
}
4546

4647
server {

‎.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ http {
1414
default_type application/octet-stream;
1515
types {
1616
text/javascript mjs;
17-
application/wasm wasm;
1817
}
1918

2019
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
@@ -39,8 +38,10 @@ http {
3938

4039
#gzip on;
4140

41+
resolver 127.0.0.11 valid=2s;
4242
upstream php-handler {
43-
server app:9000;
43+
zone backends 64k;
44+
server app:9000 resolve;
4445
}
4546

4647
server {

‎.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ http {
1414
default_type application/octet-stream;
1515
types {
1616
text/javascript mjs;
17-
application/wasm wasm;
1817
}
1918

2019
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
@@ -39,8 +38,10 @@ http {
3938

4039
#gzip on;
4140

41+
resolver 127.0.0.11 valid=2s;
4242
upstream php-handler {
43-
server app:9000;
43+
zone backends 64k;
44+
server app:9000 resolve;
4445
}
4546

4647
server {

‎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/

0 commit comments

Comments
 (0)