Merge remote-tracking branch 'origin/master' into internal

Signed-off-by: GitHub <noreply@github.com>
This commit is contained in:
Eric Nemchik 2023-06-21 14:12:36 +00:00 committed by GitHub
commit 26a0540cd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 66 additions and 64 deletions

View File

@ -246,7 +246,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **19.06.23:** - Move Nextcloud installation inside container. Remove CLI updater. [See changes announcement](https://info.linuxserver.io/issues/2023-06-19-nextcloud/).
* **22.06.23:** - Move Nextcloud installation inside container. Remove CLI updater. [See changes announcement](https://info.linuxserver.io/issues/2023-06-19-nextcloud/).
* **21.06.23:** - Existing users should update `/config/nginx/site-confs/default.conf` - Security fix for real ip settings.
* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
* **13.04.23:** - Move ssl.conf include to default.conf.
* **21.03.23:** - Add php81-sysvsem as new dep for v26. Update default X-Robots-Tag to `noindex, nofollow``.

View File

@ -13,9 +13,9 @@ argon2-libs 20190702-r4 apk
avahi-libs 0.8-r13 apk
bash 5.2.15-r5 apk
brotli-libs 1.0.9-r14 apk
busybox 1.36.0 binary
busybox 1.36.0-r9 apk
busybox-binsh 1.36.0-r9 apk
busybox 1.36.1 binary
busybox 1.36.1-r0 apk
busybox-binsh 1.36.1-r0 apk
c-client 2007f-r15 apk
ca-certificates 20230506-r0 apk
ca-certificates-bundle 20230506-r0 apk
@ -23,9 +23,9 @@ cairo 1.17.8-r1 apk
cairo-gobject 1.17.8-r1 apk
cjson 1.7.15-r4 apk
coreutils 9.3-r1 apk
cups-libs 2.4.3-r1 apk
curl 8.1.1-r1 apk
dbus-libs 1.14.6-r3 apk
cups-libs 2.4.5-r0 apk
curl 8.1.2-r0 apk
dbus-libs 1.14.8-r0 apk
ffmpeg 6.0-r14 apk
ffmpeg-libavcodec 6.0-r14 apk
ffmpeg-libavdevice 6.0-r14 apk
@ -52,8 +52,8 @@ gnutls 3.8.0-r2 apk
graphite2 1.3.14-r5 apk
harfbuzz 7.3.0-r0 apk
hwdata-pci 0.370-r0 apk
icu-data-en 73.1-r1 apk
icu-libs 73.1-r1 apk
icu-data-en 73.2-r0 apk
icu-libs 73.2-r0 apk
imagemagick 7.1.1.10-r0 apk
imagemagick-libs 7.1.1.10-r0 apk
jansson 2.14-r3 apk
@ -68,16 +68,16 @@ libass 0.17.1-r0 apk
libasyncns 0.8-r1 apk
libattr 2.5.1-r4 apk
libavif 0.11.1-r2 apk
libblkid 2.38.1-r7 apk
libblkid 2.38.1-r8 apk
libbluray 1.3.4-r0 apk
libbsd 0.11.7-r1 apk
libbz2 1.0.8-r5 apk
libc-utils 0.7.2-r5 apk
libcap2 2.69-r0 apk
libcrypto3 3.1.1-r1 apk
libcurl 8.1.1-r1 apk
libcurl 8.1.2-r0 apk
libdav1d 1.2.1-r0 apk
libde265 1.0.11-r2 apk
libde265 1.0.12-r0 apk
libdrm 2.4.115-r4 apk
libedit 20221030.3.1-r1 apk
libevent 2.1.12-r6 apk
@ -91,17 +91,17 @@ libhwy 1.0.4-r1 apk
libice 1.1.1-r2 apk
libidn2 2.3.4-r1 apk
libintl 0.21.1-r7 apk
libjpeg-turbo 2.1.5.1-r2 apk
libjxl 0.8.1-r5 apk
libjpeg-turbo 2.1.5.1-r3 apk
libjxl 0.8.2-r0 apk
libldap 2.6.4-r3 apk
libltdl 2.4.7-r2 apk
libmcrypt 2.5.8-r10 apk
libmd 1.0.4-r2 apk
libmemcached-libs 1.1.4-r1 apk
libmount 2.38.1-r7 apk
libmount 2.38.1-r8 apk
libncursesw 6.4_p20230506-r0 apk
libogg 1.3.5-r4 apk
libopenmpt 0.7.1-r0 apk
libopenmpt 0.7.2-r0 apk
libpanelw 6.4_p20230506-r0 apk
libpciaccess 0.17-r2 apk
libplacebo 5.264.1-r1 apk
@ -125,14 +125,14 @@ libtasn1 4.19.0-r1 apk
libtheora 1.1.1-r17 apk
libunibreak 5.1-r0 apk
libunistring 1.1-r1 apk
libuuid 2.38.1-r7 apk
libuuid 2.38.1-r8 apk
libva 2.18.0-r1 apk
libvdpau 1.5-r1 apk
libvorbis 1.3.7-r1 apk
libvpx 1.13.0-r1 apk
libwbclient 4.18.3-r0 apk
libwebp 1.3.0-r2 apk
libx11 1.8.4-r3 apk
libx11 1.8.4-r4 apk
libxau 1.0.11-r2 apk
libxcb 1.15-r1 apk
libxdmcp 1.1.4-r2 apk
@ -169,34 +169,34 @@ p11-kit 0.24.1-r2 apk
pango 1.50.14-r1 apk
pcre 8.45-r3 apk
pcre2 10.42-r1 apk
php-cli 8.2.6 binary
php-fpm 8.2.6 binary
php82 8.2.6-r1 apk
php82-bcmath 8.2.6-r1 apk
php82-bz2 8.2.6-r1 apk
php82-common 8.2.6-r1 apk
php82-ctype 8.2.6-r1 apk
php82-curl 8.2.6-r1 apk
php82-dom 8.2.6-r1 apk
php82-exif 8.2.6-r1 apk
php82-fileinfo 8.2.6-r1 apk
php82-fpm 8.2.6-r1 apk
php82-ftp 8.2.6-r1 apk
php82-gd 8.2.6-r1 apk
php82-gmp 8.2.6-r1 apk
php82-iconv 8.2.6-r1 apk
php82-imap 8.2.6-r1 apk
php82-intl 8.2.6-r1 apk
php82-ldap 8.2.6-r1 apk
php82-mbstring 8.2.6-r1 apk
php82-mysqlnd 8.2.6-r1 apk
php82-opcache 8.2.6-r1 apk
php82-openssl 8.2.6-r1 apk
php82-pcntl 8.2.6-r1 apk
php82-pdo 8.2.6-r1 apk
php82-pdo_mysql 8.2.6-r1 apk
php82-pdo_pgsql 8.2.6-r1 apk
php82-pdo_sqlite 8.2.6-r1 apk
php-cli 8.2.7 binary
php-fpm 8.2.7 binary
php82 8.2.7-r0 apk
php82-bcmath 8.2.7-r0 apk
php82-bz2 8.2.7-r0 apk
php82-common 8.2.7-r0 apk
php82-ctype 8.2.7-r0 apk
php82-curl 8.2.7-r0 apk
php82-dom 8.2.7-r0 apk
php82-exif 8.2.7-r0 apk
php82-fileinfo 8.2.7-r0 apk
php82-fpm 8.2.7-r0 apk
php82-ftp 8.2.7-r0 apk
php82-gd 8.2.7-r0 apk
php82-gmp 8.2.7-r0 apk
php82-iconv 8.2.7-r0 apk
php82-imap 8.2.7-r0 apk
php82-intl 8.2.7-r0 apk
php82-ldap 8.2.7-r0 apk
php82-mbstring 8.2.7-r0 apk
php82-mysqlnd 8.2.7-r0 apk
php82-opcache 8.2.7-r0 apk
php82-openssl 8.2.7-r0 apk
php82-pcntl 8.2.7-r0 apk
php82-pdo 8.2.7-r0 apk
php82-pdo_mysql 8.2.7-r0 apk
php82-pdo_pgsql 8.2.7-r0 apk
php82-pdo_sqlite 8.2.7-r0 apk
php82-pecl-apcu 5.1.22-r0 apk
php82-pecl-igbinary 3.2.14-r0 apk
php82-pecl-imagick 3.7.0-r5 apk
@ -205,19 +205,19 @@ php82-pecl-memcached 3.2.0-r1 apk
php82-pecl-msgpack 2.2.0-r0 apk
php82-pecl-redis 5.3.7-r2 apk
php82-pecl-smbclient 1.1.1-r0 apk
php82-pgsql 8.2.6-r1 apk
php82-phar 8.2.6-r1 apk
php82-posix 8.2.6-r1 apk
php82-session 8.2.6-r1 apk
php82-simplexml 8.2.6-r1 apk
php82-sockets 8.2.6-r1 apk
php82-sodium 8.2.6-r1 apk
php82-sqlite3 8.2.6-r1 apk
php82-sysvsem 8.2.6-r1 apk
php82-xml 8.2.6-r1 apk
php82-xmlreader 8.2.6-r1 apk
php82-xmlwriter 8.2.6-r1 apk
php82-zip 8.2.6-r1 apk
php82-pgsql 8.2.7-r0 apk
php82-phar 8.2.7-r0 apk
php82-posix 8.2.7-r0 apk
php82-session 8.2.7-r0 apk
php82-simplexml 8.2.7-r0 apk
php82-sockets 8.2.7-r0 apk
php82-sodium 8.2.7-r0 apk
php82-sqlite3 8.2.7-r0 apk
php82-sysvsem 8.2.7-r0 apk
php82-xml 8.2.7-r0 apk
php82-xmlreader 8.2.7-r0 apk
php82-xmlwriter 8.2.7-r0 apk
php82-zip 8.2.7-r0 apk
pixman 0.42.2-r1 apk
pkgconf 1.9.5-r0 apk
popt 1.19-r2 apk
@ -238,13 +238,13 @@ soxr 0.1.3-r5 apk
speexdsp 1.2.1-r1 apk
spirv-tools 1.3.243.0-r1 apk
sqlite-libs 3.41.2-r2 apk
ssl_client 1.36.0-r9 apk
ssl_client 1.36.1-r0 apk
sudo 1.9.13_p3-r2 apk
svt-av1-libs 1.5.0-r0 apk
talloc 2.4.0-r1 apk
tdb-libs 1.4.8-r1 apk
tevent 0.14.1-r1 apk
tiff 4.5.0-r6 apk
tiff 4.5.1-r0 apk
tzdata 2023c-r1 apk
utmps-libs 0.1.2.1-r1 apk
v4l-utils-libs 1.24.1-r0 apk

View File

@ -68,7 +68,8 @@ app_setup_block: |
# changelog
changelogs:
- { date: "19.06.23:", desc: "Move Nextcloud installation inside container. Remove CLI updater. [See changes announcement](https://info.linuxserver.io/issues/2023-06-19-nextcloud/)." }
- { date: "22.06.23:", desc: "Move Nextcloud installation inside container. Remove CLI updater. [See changes announcement](https://info.linuxserver.io/issues/2023-06-19-nextcloud/)." }
- { date: "21.06.23:", desc: "Existing users should update `/config/nginx/site-confs/default.conf` - Security fix for real ip settings." }
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
- { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
- { date: "21.03.23:", desc: "Add php81-sysvsem as new dep for v26. Update default X-Robots-Tag to `noindex, nofollow``." }

View File

@ -1,4 +1,4 @@
## Version 2023/06/06 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample
## Version 2023/06/22 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample
# Set the `immutable` cache control options only for assets with a cache busting `v` argument
map $arg_v $asset_immutable {
@ -20,7 +20,7 @@ server {
root /app/www/public;
# display real ip in nginx logs when connected through reverse proxy via docker network
set_real_ip_from 172.0.0.0/8;
set_real_ip_from 172.16.0.0/12;
real_ip_header X-Forwarded-For;
# https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html#nextcloud-in-the-webroot-of-nginx