Skip to content

Commit ca08bf6

Browse files
thespadthespad
committed
Rebase to 3.22
1 parent 946e3eb commit ca08bf6

5 files changed

Lines changed: 73 additions & 69 deletions

File tree

‎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
@@ -19,44 +19,44 @@ RUN \
1919
gnu-libiconv \
2020
imagemagick \
2121
libxml2 \
22-
php83-apcu \
23-
php83-bcmath \
24-
php83-bz2 \
25-
php83-dom \
26-
php83-exif \
27-
php83-ftp \
28-
php83-gd \
29-
php83-gmp \
30-
php83-imap \
31-
php83-intl \
32-
php83-ldap \
33-
php83-opcache \
34-
php83-pcntl \
35-
php83-pdo_mysql \
36-
php83-pdo_pgsql \
37-
php83-pdo_sqlite \
38-
php83-pecl-imagick \
39-
php83-pecl-mcrypt \
40-
php83-pecl-memcached \
41-
php83-pecl-smbclient \
42-
php83-pgsql \
43-
php83-posix \
44-
php83-redis \
45-
php83-sodium \
46-
php83-sqlite3 \
47-
php83-sysvsem \
48-
php83-xmlreader \
22+
php84-apcu \
23+
php84-bcmath \
24+
php84-bz2 \
25+
php84-dom \
26+
php84-exif \
27+
php84-ftp \
28+
php84-gd \
29+
php84-gmp \
30+
php84-imap \
31+
php84-intl \
32+
php84-ldap \
33+
php84-opcache \
34+
php84-pcntl \
35+
php84-pdo_mysql \
36+
php84-pdo_pgsql \
37+
php84-pdo_sqlite \
38+
php84-pecl-imagick \
39+
php84-pecl-mcrypt \
40+
php84-pecl-memcached \
41+
php84-pecl-smbclient \
42+
php84-pgsql \
43+
php84-posix \
44+
php84-redis \
45+
php84-sodium \
46+
php84-sqlite3 \
47+
php84-sysvsem \
48+
php84-xmlreader \
4949
rsync \
5050
samba-client \
5151
sudo && \
5252
echo "**** configure php-fpm to pass env vars ****" && \
53-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
54-
grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
55-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
53+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
54+
grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \
55+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
5656
echo "**** configure php for nextcloud ****" && \
5757
{ \
5858
echo 'apc.enable_cli=1'; \
59-
} >> /etc/php83/conf.d/apcu.ini && \
59+
} >> /etc/php84/conf.d/apcu.ini && \
6060
{ \
6161
echo 'opcache.enable=1'; \
6262
echo 'opcache.interned_strings_buffer=32'; \
@@ -66,7 +66,7 @@ RUN \
6666
echo 'opcache.revalidate_freq=60'; \
6767
echo 'opcache.jit=1255'; \
6868
echo 'opcache.jit_buffer_size=128M'; \
69-
} >> "/etc/php83/conf.d/00_opcache.ini" && \
69+
} >> "/etc/php84/conf.d/00_opcache.ini" && \
7070
{ \
7171
echo 'memory_limit=-1'; \
7272
echo 'upload_max_filesize=100G'; \
@@ -75,7 +75,7 @@ RUN \
7575
echo 'max_execution_time=3600'; \
7676
echo 'output_buffering=0'; \
7777
echo 'always_populate_raw_post_data=-1'; \
78-
} >> "/etc/php83/conf.d/nextcloud.ini" && \
78+
} >> "/etc/php84/conf.d/nextcloud.ini" && \
7979
echo "**** install nextcloud ****" && \
8080
mkdir -p \
8181
/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
@@ -19,44 +19,44 @@ RUN \
1919
gnu-libiconv \
2020
imagemagick \
2121
libxml2 \
22-
php83-apcu \
23-
php83-bcmath \
24-
php83-bz2 \
25-
php83-dom \
26-
php83-exif \
27-
php83-ftp \
28-
php83-gd \
29-
php83-gmp \
30-
php83-imap \
31-
php83-intl \
32-
php83-ldap \
33-
php83-opcache \
34-
php83-pcntl \
35-
php83-pdo_mysql \
36-
php83-pdo_pgsql \
37-
php83-pdo_sqlite \
38-
php83-pecl-imagick \
39-
php83-pecl-mcrypt \
40-
php83-pecl-memcached \
41-
php83-pecl-smbclient \
42-
php83-pgsql \
43-
php83-posix \
44-
php83-redis \
45-
php83-sodium \
46-
php83-sqlite3 \
47-
php83-sysvsem \
48-
php83-xmlreader \
22+
php84-apcu \
23+
php84-bcmath \
24+
php84-bz2 \
25+
php84-dom \
26+
php84-exif \
27+
php84-ftp \
28+
php84-gd \
29+
php84-gmp \
30+
php84-imap \
31+
php84-intl \
32+
php84-ldap \
33+
php84-opcache \
34+
php84-pcntl \
35+
php84-pdo_mysql \
36+
php84-pdo_pgsql \
37+
php84-pdo_sqlite \
38+
php84-pecl-imagick \
39+
php84-pecl-mcrypt \
40+
php84-pecl-memcached \
41+
php84-pecl-smbclient \
42+
php84-pgsql \
43+
php84-posix \
44+
php84-redis \
45+
php84-sodium \
46+
php84-sqlite3 \
47+
php84-sysvsem \
48+
php84-xmlreader \
4949
rsync \
5050
samba-client \
5151
sudo && \
5252
echo "**** configure php-fpm to pass env vars ****" && \
53-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
54-
grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
55-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
53+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
54+
grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \
55+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
5656
echo "**** configure php for nextcloud ****" && \
5757
{ \
5858
echo 'apc.enable_cli=1'; \
59-
} >> /etc/php83/conf.d/apcu.ini && \
59+
} >> /etc/php84/conf.d/apcu.ini && \
6060
{ \
6161
echo 'opcache.enable=1'; \
6262
echo 'opcache.interned_strings_buffer=32'; \
@@ -66,7 +66,7 @@ RUN \
6666
echo 'opcache.revalidate_freq=60'; \
6767
echo 'opcache.jit=1255'; \
6868
echo 'opcache.jit_buffer_size=128M'; \
69-
} >> "/etc/php83/conf.d/00_opcache.ini" && \
69+
} >> "/etc/php84/conf.d/00_opcache.ini" && \
7070
{ \
7171
echo 'memory_limit=-1'; \
7272
echo 'upload_max_filesize=100G'; \
@@ -75,7 +75,7 @@ RUN \
7575
echo 'max_execution_time=3600'; \
7676
echo 'output_buffering=0'; \
7777
echo 'always_populate_raw_post_data=-1'; \
78-
} >> "/etc/php83/conf.d/nextcloud.ini" && \
78+
} >> "/etc/php84/conf.d/nextcloud.ini" && \
7979
echo "**** install nextcloud ****" && \
8080
mkdir -p \
8181
/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
@@ -144,6 +144,7 @@ init_diagram: |
144144
"nextcloud:develop" <- Base Images
145145
# changelog
146146
changelogs:
147+
- {date: "10.07.25:", desc: "Rebase to Alpine 3.22."}
147148
- {date: "12.02.25:", desc: "Rebase to Alpine 3.21."}
148149
- {date: "09.01.25:", desc: "Fix uploading large files. Existing users should update their nginx confs."}
149150
- {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)