diff --git a/Dockerfile b/Dockerfile index 66e69fee..f9fb0e46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.21 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22 # set version label ARG BUILD_DATE @@ -19,44 +19,43 @@ RUN \ gnu-libiconv \ imagemagick \ libxml2 \ - php83-apcu \ - php83-bcmath \ - php83-bz2 \ - php83-dom \ - php83-exif \ - php83-ftp \ - php83-gd \ - php83-gmp \ - php83-imap \ - php83-intl \ - php83-ldap \ - php83-opcache \ - php83-pcntl \ - php83-pdo_mysql \ - php83-pdo_pgsql \ - php83-pdo_sqlite \ - php83-pecl-imagick \ - php83-pecl-mcrypt \ - php83-pecl-memcached \ - php83-pecl-smbclient \ - php83-pgsql \ - php83-posix \ - php83-redis \ - php83-sodium \ - php83-sqlite3 \ - php83-sysvsem \ - php83-xmlreader \ + php84-apcu \ + php84-bcmath \ + php84-bz2 \ + php84-dom \ + php84-exif \ + php84-ftp \ + php84-gd \ + php84-gmp \ + php84-imap \ + php84-intl \ + php84-ldap \ + php84-opcache \ + php84-pcntl \ + php84-pdo_mysql \ + php84-pdo_pgsql \ + php84-pdo_sqlite \ + php84-pecl-imagick \ + php84-pecl-memcached \ + php84-pecl-smbclient \ + php84-pgsql \ + php84-posix \ + php84-redis \ + php84-sodium \ + php84-sqlite3 \ + php84-sysvsem \ + php84-xmlreader \ rsync \ samba-client \ sudo && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \ + if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \ echo "**** configure php for nextcloud ****" && \ { \ echo 'apc.enable_cli=1'; \ - } >> /etc/php83/conf.d/apcu.ini && \ + } >> /etc/php84/conf.d/apcu.ini && \ { \ echo 'opcache.enable=1'; \ echo 'opcache.interned_strings_buffer=32'; \ @@ -66,7 +65,7 @@ RUN \ echo 'opcache.revalidate_freq=60'; \ echo 'opcache.jit=1255'; \ echo 'opcache.jit_buffer_size=128M'; \ - } >> "/etc/php83/conf.d/00_opcache.ini" && \ + } >> "/etc/php84/conf.d/00_opcache.ini" && \ { \ echo 'memory_limit=-1'; \ echo 'upload_max_filesize=100G'; \ @@ -75,7 +74,7 @@ RUN \ echo 'max_execution_time=3600'; \ echo 'output_buffering=0'; \ echo 'always_populate_raw_post_data=-1'; \ - } >> "/etc/php83/conf.d/nextcloud.ini" && \ + } >> "/etc/php84/conf.d/nextcloud.ini" && \ echo "**** install nextcloud ****" && \ mkdir -p \ /app/www/src/ && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 24779601..dbc85f4f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.21 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22 # set version label ARG BUILD_DATE @@ -19,44 +19,43 @@ RUN \ gnu-libiconv \ imagemagick \ libxml2 \ - php83-apcu \ - php83-bcmath \ - php83-bz2 \ - php83-dom \ - php83-exif \ - php83-ftp \ - php83-gd \ - php83-gmp \ - php83-imap \ - php83-intl \ - php83-ldap \ - php83-opcache \ - php83-pcntl \ - php83-pdo_mysql \ - php83-pdo_pgsql \ - php83-pdo_sqlite \ - php83-pecl-imagick \ - php83-pecl-mcrypt \ - php83-pecl-memcached \ - php83-pecl-smbclient \ - php83-pgsql \ - php83-posix \ - php83-redis \ - php83-sodium \ - php83-sqlite3 \ - php83-sysvsem \ - php83-xmlreader \ + php84-apcu \ + php84-bcmath \ + php84-bz2 \ + php84-dom \ + php84-exif \ + php84-ftp \ + php84-gd \ + php84-gmp \ + php84-imap \ + php84-intl \ + php84-ldap \ + php84-opcache \ + php84-pcntl \ + php84-pdo_mysql \ + php84-pdo_pgsql \ + php84-pdo_sqlite \ + php84-pecl-imagick \ + php84-pecl-memcached \ + php84-pecl-smbclient \ + php84-pgsql \ + php84-posix \ + php84-redis \ + php84-sodium \ + php84-sqlite3 \ + php84-sysvsem \ + php84-xmlreader \ rsync \ samba-client \ sudo && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \ + if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \ echo "**** configure php for nextcloud ****" && \ { \ echo 'apc.enable_cli=1'; \ - } >> /etc/php83/conf.d/apcu.ini && \ + } >> /etc/php84/conf.d/apcu.ini && \ { \ echo 'opcache.enable=1'; \ echo 'opcache.interned_strings_buffer=32'; \ @@ -66,7 +65,7 @@ RUN \ echo 'opcache.revalidate_freq=60'; \ echo 'opcache.jit=1255'; \ echo 'opcache.jit_buffer_size=128M'; \ - } >> "/etc/php83/conf.d/00_opcache.ini" && \ + } >> "/etc/php84/conf.d/00_opcache.ini" && \ { \ echo 'memory_limit=-1'; \ echo 'upload_max_filesize=100G'; \ @@ -75,7 +74,7 @@ RUN \ echo 'max_execution_time=3600'; \ echo 'output_buffering=0'; \ echo 'always_populate_raw_post_data=-1'; \ - } >> "/etc/php83/conf.d/nextcloud.ini" && \ + } >> "/etc/php84/conf.d/nextcloud.ini" && \ echo "**** install nextcloud ****" && \ mkdir -p \ /app/www/src/ && \ diff --git a/README.md b/README.md index a7bf60fb..cdd79c30 100644 --- a/README.md +++ b/README.md @@ -347,6 +347,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.07.25:** - Rebase to Alpine 3.22. * **12.02.25:** - Rebase to Alpine 3.21. * **09.01.25:** - Fix uploading large files. Existing users should update their nginx confs. * **09.07.24:** - Add `previous` tag for n-1 releases. diff --git a/readme-vars.yml b/readme-vars.yml index cea804cb..6c8abd2a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -144,6 +144,7 @@ init_diagram: | "nextcloud:develop" <- Base Images # changelog changelogs: + - {date: "10.07.25:", desc: "Rebase to Alpine 3.22."} - {date: "12.02.25:", desc: "Rebase to Alpine 3.21."} - {date: "09.01.25:", desc: "Fix uploading large files. Existing users should update their nginx confs."} - {date: "09.07.24:", desc: "Add `previous` tag for n-1 releases."} diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index fa5ca64b..72ce8274 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,4 +1,4 @@ -## Version 2024/07/16 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2025/07/10 - 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 { @@ -11,6 +11,8 @@ server { listen [::]:80 default_server; listen 443 ssl default_server; listen [::]:443 ssl default_server; + listen 443 quic reuseport default_server; + listen [::]:443 quic reuseport default_server; server_name _;