Skip to content

Commit 5b240d5

Browse files
thespadthespad
committed
Rebase to 3.22
1 parent 44a7602 commit 5b240d5

File tree

5 files changed

+73
-69
lines changed

5 files changed

+73
-69
lines changed

‎Dockerfile

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.21
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22
44

55
# set version label
66
ARG BUILD_DATE
@@ -22,45 +22,45 @@ RUN \
2222
imagemagick-pdf \
2323
imagemagick-svg \
2424
libxml2 \
25-
php83-apcu \
26-
php83-bcmath \
27-
php83-bz2 \
28-
php83-dom \
29-
php83-exif \
30-
php83-ftp \
31-
php83-gd \
32-
php83-gmp \
33-
php83-imap \
34-
php83-intl \
35-
php83-ldap \
36-
php83-opcache \
37-
php83-pcntl \
38-
php83-pdo_mysql \
39-
php83-pdo_pgsql \
40-
php83-pdo_sqlite \
41-
php83-pecl-imagick \
42-
php83-pecl-mcrypt \
43-
php83-pecl-memcached \
44-
php83-pecl-smbclient \
45-
php83-pgsql \
46-
php83-posix \
47-
php83-redis \
48-
php83-sodium \
49-
php83-sqlite3 \
50-
php83-sysvsem \
51-
php83-xmlreader \
25+
php84-apcu \
26+
php84-bcmath \
27+
php84-bz2 \
28+
php84-dom \
29+
php84-exif \
30+
php84-ftp \
31+
php84-gd \
32+
php84-gmp \
33+
php84-imap \
34+
php84-intl \
35+
php84-ldap \
36+
php84-opcache \
37+
php84-pcntl \
38+
php84-pdo_mysql \
39+
php84-pdo_pgsql \
40+
php84-pdo_sqlite \
41+
php84-pecl-imagick \
42+
php84-pecl-mcrypt \
43+
php84-pecl-memcached \
44+
php84-pecl-smbclient \
45+
php84-pgsql \
46+
php84-posix \
47+
php84-redis \
48+
php84-sodium \
49+
php84-sqlite3 \
50+
php84-sysvsem \
51+
php84-xmlreader \
5252
rsync \
5353
samba-client \
5454
util-linux \
5555
sudo && \
5656
echo "**** configure php-fpm to pass env vars ****" && \
57-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
58-
grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
59-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
57+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
58+
grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \
59+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
6060
echo "**** configure php for nextcloud ****" && \
6161
{ \
6262
echo 'apc.enable_cli=1'; \
63-
} >> /etc/php83/conf.d/apcu.ini && \
63+
} >> /etc/php84/conf.d/apcu.ini && \
6464
{ \
6565
echo 'opcache.enable=1'; \
6666
echo 'opcache.interned_strings_buffer=32'; \
@@ -70,7 +70,7 @@ RUN \
7070
echo 'opcache.revalidate_freq=60'; \
7171
echo 'opcache.jit=1255'; \
7272
echo 'opcache.jit_buffer_size=128M'; \
73-
} >> "/etc/php83/conf.d/00_opcache.ini" && \
73+
} >> "/etc/php84/conf.d/00_opcache.ini" && \
7474
{ \
7575
echo 'memory_limit=-1'; \
7676
echo 'upload_max_filesize=100G'; \
@@ -79,7 +79,7 @@ RUN \
7979
echo 'max_execution_time=3600'; \
8080
echo 'output_buffering=0'; \
8181
echo 'always_populate_raw_post_data=-1'; \
82-
} >> "/etc/php83/conf.d/nextcloud.ini" && \
82+
} >> "/etc/php84/conf.d/nextcloud.ini" && \
8383
echo "**** install nextcloud ****" && \
8484
mkdir -p \
8585
/app/www/src/ && \

‎Dockerfile.aarch64

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.21
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22
44

55
# set version label
66
ARG BUILD_DATE
@@ -22,45 +22,45 @@ RUN \
2222
imagemagick-pdf \
2323
imagemagick-svg \
2424
libxml2 \
25-
php83-apcu \
26-
php83-bcmath \
27-
php83-bz2 \
28-
php83-dom \
29-
php83-exif \
30-
php83-ftp \
31-
php83-gd \
32-
php83-gmp \
33-
php83-imap \
34-
php83-intl \
35-
php83-ldap \
36-
php83-opcache \
37-
php83-pcntl \
38-
php83-pdo_mysql \
39-
php83-pdo_pgsql \
40-
php83-pdo_sqlite \
41-
php83-pecl-imagick \
42-
php83-pecl-mcrypt \
43-
php83-pecl-memcached \
44-
php83-pecl-smbclient \
45-
php83-pgsql \
46-
php83-posix \
47-
php83-redis \
48-
php83-sodium \
49-
php83-sqlite3 \
50-
php83-sysvsem \
51-
php83-xmlreader \
25+
php84-apcu \
26+
php84-bcmath \
27+
php84-bz2 \
28+
php84-dom \
29+
php84-exif \
30+
php84-ftp \
31+
php84-gd \
32+
php84-gmp \
33+
php84-imap \
34+
php84-intl \
35+
php84-ldap \
36+
php84-opcache \
37+
php84-pcntl \
38+
php84-pdo_mysql \
39+
php84-pdo_pgsql \
40+
php84-pdo_sqlite \
41+
php84-pecl-imagick \
42+
php84-pecl-mcrypt \
43+
php84-pecl-memcached \
44+
php84-pecl-smbclient \
45+
php84-pgsql \
46+
php84-posix \
47+
php84-redis \
48+
php84-sodium \
49+
php84-sqlite3 \
50+
php84-sysvsem \
51+
php84-xmlreader \
5252
rsync \
5353
samba-client \
5454
util-linux \
5555
sudo && \
5656
echo "**** configure php-fpm to pass env vars ****" && \
57-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
58-
grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
59-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
57+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
58+
grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \
59+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
6060
echo "**** configure php for nextcloud ****" && \
6161
{ \
6262
echo 'apc.enable_cli=1'; \
63-
} >> /etc/php83/conf.d/apcu.ini && \
63+
} >> /etc/php84/conf.d/apcu.ini && \
6464
{ \
6565
echo 'opcache.enable=1'; \
6666
echo 'opcache.interned_strings_buffer=32'; \
@@ -70,7 +70,7 @@ RUN \
7070
echo 'opcache.revalidate_freq=60'; \
7171
echo 'opcache.jit=1255'; \
7272
echo 'opcache.jit_buffer_size=128M'; \
73-
} >> "/etc/php83/conf.d/00_opcache.ini" && \
73+
} >> "/etc/php84/conf.d/00_opcache.ini" && \
7474
{ \
7575
echo 'memory_limit=-1'; \
7676
echo 'upload_max_filesize=100G'; \
@@ -79,7 +79,7 @@ RUN \
7979
echo 'max_execution_time=3600'; \
8080
echo 'output_buffering=0'; \
8181
echo 'always_populate_raw_post_data=-1'; \
82-
} >> "/etc/php83/conf.d/nextcloud.ini" && \
82+
} >> "/etc/php84/conf.d/nextcloud.ini" && \
8383
echo "**** install nextcloud ****" && \
8484
mkdir -p \
8585
/app/www/src/ && \

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
347347

348348
## Versions
349349

350+
* **10.07.25:** - Rebase to Alpine 3.22.
350351
* **12.02.25:** - Rebase to Alpine 3.21.
351352
* **09.01.25:** - Fix uploading large files. Existing users should update their nginx confs.
352353
* **09.07.24:** - Add `previous` tag for n-1 releases.

‎readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ init_diagram: |
145145
"nextcloud:latest" <- Base Images
146146
# changelog
147147
changelogs:
148+
- {date: "10.07.25:", desc: "Rebase to Alpine 3.22."}
148149
- {date: "12.02.25:", desc: "Rebase to Alpine 3.21."}
149150
- {date: "09.01.25:", desc: "Fix uploading large files. Existing users should update their nginx confs."}
150151
- {date: "09.07.24:", desc: "Add `previous` tag for n-1 releases."}

‎root/defaults/nginx/site-confs/default.conf.sample

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Version 2024/07/16 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample
1+
## Version 2025/07/10 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample
22

33
# Set the `immutable` cache control options only for assets with a cache busting `v` argument
44
map $arg_v $asset_immutable {
@@ -11,6 +11,8 @@ server {
1111
listen [::]:80 default_server;
1212
listen 443 ssl default_server;
1313
listen [::]:443 ssl default_server;
14+
listen 443 quic reuseport default_server;
15+
listen [::]:443 quic reuseport default_server;
1416

1517
server_name _;
1618

0 commit comments

Comments
 (0)