chore: update Nextcloud to 33.0.6

- update Nextcloud to version 33.0.0
  - update Alpine Linux to 3.23
  - update PHP to 8.4
  - update hardened_malloc to branch 16
  - change verification of hardened_malloc to SSH signature instead of gpg
  - update Snuffleupagus to 0.13.0

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
       - version-*
   schedule:
     # Build the image regularly (each Friday)
-    - cron: '23 04 * * 5'
+    - cron: "23 04 * * 5"
 
 env:
   REGISTRY: ghcr.io
@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
 
       - name: Extract version for tags
         run: |
@@ -37,16 +37,14 @@ jobs:
 
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@main
+        uses: sigstore/cosign-installer@v4.1.1
-        with:
-          cosign-release: 'v2.2.2'
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v4
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.repository_owner }}
@@ -54,7 +52,7 @@ jobs:
 
       - name: Set Docker metadata
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v6
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -62,12 +60,28 @@ jobs:
             ${{ env.FULL_VERSION }}
             ${{ env.MAJOR_VERSION }}
 
-      - name: Build and push Docker image
+      - name: Build and export Docker image to Docker
-        id: build-and-push
+        id: build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v7
+        with:
+          load: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:testing
+          context: .
+
+      - name: Test Docker image
+        id: test
+        run: |
+          docker run -d -p 8888:8888 --name nextcloud --rm ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:testing && \
+          sleep 5 && docker exec nextcloud occ status && \
+          nc -z localhost 8888
+
+      - name: Push Docker image
+        id: push
+        if: github.event_name != 'pull_request'
+        uses: docker/build-push-action@v7
         with:
           context: .
-          push: ${{ github.event_name != 'pull_request' }}
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
@@ -75,4 +89,4 @@ jobs:
         if: ${{ github.event_name != 'pull_request' }}
         env:
           COSIGN_EXPERIMENTAL: "true"
-        run: cosign sign --yes ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}
+        run: cosign sign --yes ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.push.outputs.digest }}

.github/workflows/scan.yml

@@ -3,27 +3,27 @@ name: scan
 on:
   schedule:
     # Scan the image regularly (once a day)
-    - cron: '45 03 * * *'
+    - cron: "45 03 * * *"
 
 jobs:
   build:
     name: Scan current image & report results
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-24.04"
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
 
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
+        uses: aquasecurity/trivy-action@v0.36.0
         with:
-          image-ref: 'ghcr.io/${{ github.actor }}/nextcloud'
+          image-ref: "ghcr.io/${{ github.actor }}/nextcloud"
-          format: 'template'
+          format: "template"
-          template: '@/contrib/sarif.tpl'
+          template: "@/contrib/sarif.tpl"
-          output: 'trivy-results.sarif'
+          output: "trivy-results.sarif"
-          severity: 'CRITICAL,HIGH'
+          severity: "CRITICAL,HIGH"
           vuln-type: "os"
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v3
         with:
-          sarif_file: 'trivy-results.sarif'
+          sarif_file: "trivy-results.sarif"

Dockerfile

@@ -1,24 +1,24 @@
 # -------------- Build-time variables --------------
-ARG NEXTCLOUD_VERSION=28.0.6
+ARG NEXTCLOUD_VERSION=33.0.6
-ARG PHP_VERSION=8.2
+ARG PHP_VERSION=8.4
-ARG NGINX_VERSION=1.26
+ARG NGINX_VERSION=1.28
 
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.23
-ARG HARDENED_MALLOC_VERSION=11
+ARG HARDENED_MALLOC_VERSION=14
-ARG SNUFFLEUPAGUS_VERSION=0.10.0
+ARG SNUFFLEUPAGUS_VERSION=0.13.0
 
 ARG UID=1000
 ARG GID=1000
 
-# nextcloud-28.0.6.tar.bz2
+# nextcloud-33.0.6.tar.bz2
-ARG SHA256_SUM="df0d3384b447cba1e128f22080f6780521f868169beabee8ea0d155bf9c66b8f"
+ARG SHA256_SUM="791821a55029944de04319cfcafcac4ae8e7ef56b4cd1efc2631bf30b79d16de"
 
 # Nextcloud Security <security@nextcloud.com> (D75899B9A724937A)
 ARG GPG_FINGERPRINT="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 # ---------------------------------------------------
 
 ### Build PHP base
-FROM docker.io/library/php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION} as base
+FROM docker.io/library/php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION} AS base
 
 ARG SNUFFLEUPAGUS_VERSION
 
@@ -85,25 +85,26 @@ RUN apk -U upgrade \
 
 ### Build Hardened Malloc
 ARG ALPINE_VERSION
-FROM docker.io/library/alpine:${ALPINE_VERSION} as build-malloc
+FROM docker.io/library/alpine:${ALPINE_VERSION} AS build-malloc
 
 ARG HARDENED_MALLOC_VERSION
 ARG CONFIG_NATIVE=false
 ARG VARIANT=light
 
-RUN apk --no-cache add build-base git gnupg && cd /tmp \
+RUN apk --no-cache add build-base git openssh && cd /tmp \
- && wget -q https://github.com/thestinger.gpg && gpg --import thestinger.gpg \
+ && wget -q -O - https://github.com/thestinger.keys | while read -r key; do echo "thestinger@github.com $key"; done > allowed_signers \
- && git clone --depth 1 --branch ${HARDENED_MALLOC_VERSION} https://github.com/GrapheneOS/hardened_malloc \
+ && git config --global gpg.ssh.allowedSignersFile /tmp/allowed_signers && git init hardened_malloc && cd hardened_malloc \
- && cd hardened_malloc && git verify-tag $(git describe --tags) \
+ && git fetch --depth 1 https://github.com/GrapheneOS/hardened_malloc tag ${HARDENED_MALLOC_VERSION} \
+ && git checkout FETCH_HEAD && git verify-tag $(git describe --tags) \
  && make CONFIG_NATIVE=${CONFIG_NATIVE} VARIANT=${VARIANT}
 
 
 ### Fetch nginx
-FROM docker.io/library/nginx:${NGINX_VERSION}-alpine as nginx
+FROM docker.io/library/nginx:${NGINX_VERSION}-alpine${ALPINE_VERSION} AS nginx
 
 
 ### Build Nextcloud (production environemnt)
-FROM base as nextcloud
+FROM base AS nextcloud
 
 COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx
 COPY --from=nginx /etc/nginx /etc/nginx

README.md

@@ -35,7 +35,7 @@ ___
 - Includes **Snuffleupagus**, [a PHP security module](https://github.com/jvoisin/snuffleupagus).
 - Includes a simple **built-in cron** system.
 - Much easier to maintain thanks to multi-stages build.
-- Does not include imagick, samba, etc. by default.
+- Includes imagick and smbclient for extended file handling and SMB/CIFS support.
 
 You're free to make your own image based on this one if you want a specific feature. Uncommon features won't be included as they can increase attack surface: this image intends to stay **minimal**, but **functional enough** to cover basic needs.
 
@@ -58,8 +58,8 @@ Verifying the signature isn't a requirement, and might not be as seamless as usi
 ## Tags
 
 - `latest` : latest Nextcloud version
-- `x` : latest Nextcloud x.x (e.g. `28`)
+- `x` : latest Nextcloud x.x (e.g. `33`)
-- `x.x.x` : Nextcloud x.x.x (e.g. `28.0.0`)
+- `x.x.x` : Nextcloud x.x.x (e.g. `33.0.0`)
 
 You can always have a glance [here](https://github.com/users/hoellen/packages/container/package/nextcloud).
 Only the **latest stable version** will be maintained by myself.

SECURITY.md

@@ -5,10 +5,15 @@
 All versions of the Nextcloud community version which still receive updates will be supported
 and will receive the minor version updates and security patches.
 
-| Version | Supported          |
+| Version | Supported                     |
-| ------- | ------------------ |
+| ------- | ----------------------------- |
-| 28. x   | :white_check_mark: |
+| 33. x   | :white_check_mark:            |
-| 27. x   | :white_check_mark: |
+| 32. x   | :white_check_mark:            |
+| 31. x   | :negative_squared_cross_mark: |
+| 30. x   | :negative_squared_cross_mark: |
+| 29. x   | :negative_squared_cross_mark: |
+| 28. x   | :negative_squared_cross_mark: |
+| 27. x   | :negative_squared_cross_mark: |
 | 26. x   | :negative_squared_cross_mark: |
 | 25. x   | :negative_squared_cross_mark: |
 | 24. x   | :negative_squared_cross_mark: |
@@ -24,9 +29,10 @@ Uploaded images are regularly scanned for [OS vulnerabilities](https://github.co
 
 ## Reporting a vulnerability
 
-*Upstream* vulnerabilities should be reported to *upstream* projects according to their own security policies.
+_Upstream_ vulnerabilities should be reported to _upstream_ projects according to their own security policies.
 
 Regarding vulnerabilities specific to this project:
+
 - Faulty configuration files
 - Unsafe defaults
 - Dependencies security updates

rootfs/etc/nginx/conf.d/default.conf

@@ -1,27 +1,21 @@
-map $http_x_forwarded_port $nc_port {
-  default "$http_x_forwarded_port";
-  ''      "$server_port";
-}
-
-map $http_x_forwarded_proto $nc_proto {
-  default "$http_x_forwarded_proto";
-  ''      "$scheme";
-}
-
 server {
         listen 8888;
+        listen [::]:8888;
         root /nextcloud;
 
+        # Emit relative redirects (protocol handled by reverse proxy)
+        absolute_redirect off;
+
         fastcgi_buffers 64 4K;
         fastcgi_hide_header X-Powered-By;
         large_client_header_buffers 4 16k;
+        client_body_timeout 300s;
 
         add_header Referrer-Policy "no-referrer" always;
         add_header X-Content-Type-Options "nosniff" always;
         add_header X-Frame-Options "SAMEORIGIN" always;
         add_header X-Permitted-Cross-Domain-Policies "none" always;
         add_header X-Robots-Tag "noindex, nofollow" always;
-        add_header X-XSS-Protection "0" always;
 
         location = /robots.txt {
             allow all;
@@ -30,14 +24,18 @@ server {
         }
 
         location ^~ /.well-known {
-            location = /.well-known/carddav   { return 301 $nc_proto://$host/remote.php/dav; }
+            location = /.well-known/carddav { return 301 /remote.php/dav/; }
-            location = /.well-known/caldav    { return 301 $nc_proto://$host/remote.php/dav; }
+            location = /.well-known/caldav  { return 301 /remote.php/dav/; }
-            location ^~ /.well-known          { return 301 $nc_proto://$host/index.php$uri;  }
+
-            try_files $uri $uri/ =404;
+            return 301 /index.php$request_uri;
         }
 
         location / {
-            rewrite ^ /index.php$uri;
+            rewrite ^ /index.php$request_uri;
+        }
+
+        location /remote {
+            return 301 /remote.php$request_uri;
         }
 
         location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) {
@@ -48,9 +46,9 @@ server {
             return 404;
         }
 
-        location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy)\.php(?:$|\/) {
+        location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy)\.php(?:$|\/) {
             include /etc/nginx/fastcgi_params;
-            fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            fastcgi_split_path_info ^(.+?\.php)(/.*)$;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             fastcgi_param PATH_INFO $fastcgi_path_info;
             fastcgi_param modHeadersAvailable true;
@@ -61,25 +59,20 @@ server {
             fastcgi_read_timeout 1200;
         }
 
-        location ~ ^\/(?:updater|ocs-provider)(?:$|\/) {
+        location ~ ^/(?:updater|ocs-provider)(?:$|/) {
             try_files $uri/ =404;
             index index.php;
         }
 
-        location ~ \.(?:css|js|mjs|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
+        location ~ \.(?:css|js|mjs|svg|gif|ico|jpg|jpeg|png|webp|wasm|tflite|map|ogg|flac|mp4|webm)$ {
-            try_files $uri /index.php$uri$is_args$args;
+            try_files $uri /index.php$request_uri;
             expires 6M;
             access_log off;
         }
 
-        location ~ \.woff2?$ {
+        location ~ \.(otf|woff2?)$ {
-            try_files $uri /index.php$uri$is_args$args;
+            try_files $uri /index.php$request_uri;
             expires 7d;
             access_log off;
         }
-
-        location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ {
-            try_files $uri /index.php$uri$is_args$args;
-            access_log off;
-        }
 }

rootfs/usr/local/bin/run.sh

@@ -34,4 +34,4 @@ else
 fi
 
 # Run processes
-exec /bin/s6-svscan /etc/s6.d
+exec /usr/bin/s6-svscan /etc/s6.d

rootfs/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini

@@ -1,7 +1,6 @@
 zend_extension=opcache.so
 opcache.enable=1
 opcache.enable_cli=1
-opcache.fast_shutdown=1
 opcache.memory_consumption=<OPCACHE_MEM_SIZE>
 opcache.interned_strings_buffer=16
 opcache.max_accelerated_files=10000