Merge 38b9fc3721 into 16acf58089

.github/workflows/build.yml

@@ -6,6 +6,8 @@ on:
     branches:
       - master
       - version-*
+  # Run tests for any PRs
+  pull_request:
   schedule:
     # Build the image regularly (each Friday)
     - cron: '23 04 * * 5'
@@ -62,28 +64,12 @@ jobs:
             ${{ env.FULL_VERSION }}
             ${{ env.MAJOR_VERSION }}
 
-      - name: Build and export Docker image to Docker
-        id: build
-        uses: docker/build-push-action@v2
-        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 && \
-          docker exec nextcloud occ status && \
-          nc -z localhost 8888
-
-      - name: Push Docker image
-        id: push
-        if: github.event_name != 'pull_request'
+      - name: Build and push Docker image
+        id: build-and-push
         uses: docker/build-push-action@v2
         with:
           context: .
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
@@ -91,4 +77,4 @@ jobs:
         if: ${{ github.event_name != 'pull_request' }}
         env:
           COSIGN_EXPERIMENTAL: "true"
-        run: cosign sign --yes ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.push.outputs.digest }}
+        run: cosign sign --yes ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}

.github/workflows/scan.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   build:
     name: Scan current image & report results
-    runs-on: "ubuntu-24.04"
+    runs-on: "ubuntu-20.04"
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

Dockerfile

@@ -1,7 +1,7 @@
 # -------------- Build-time variables --------------
-ARG NEXTCLOUD_VERSION=32.0.0
+ARG NEXTCLOUD_VERSION=30.0.4
 ARG PHP_VERSION=8.3
-ARG NGINX_VERSION=1.28
+ARG NGINX_VERSION=1.26
 
 ARG ALPINE_VERSION=3.21
 ARG HARDENED_MALLOC_VERSION=11
@@ -10,15 +10,15 @@ ARG SNUFFLEUPAGUS_VERSION=0.10.0
 ARG UID=1000
 ARG GID=1000
 
-# nextcloud-32.0.0.tar.bz2
-ARG SHA256_SUM="57448d55d9b87102f17c36347320346a1b258f6017c63b958c789efd42e345a3"
+# nextcloud-30.0.4.tar.bz2
+ARG SHA256_SUM="eb6aaba9acef442f2b3e4a996b7ee8a5ed24442f9bba681237fb28ed970e1fa5"
 
 # 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,7 +85,7 @@ 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
@@ -99,11 +99,11 @@ RUN apk --no-cache add build-base git gnupg && cd /tmp \
 
 
 ### Fetch nginx
-FROM docker.io/library/nginx:${NGINX_VERSION}-alpine AS nginx
+FROM docker.io/library/nginx:${NGINX_VERSION}-alpine 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

@@ -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. `32`)
-- `x.x.x` : Nextcloud x.x.x (e.g. `32.0.0`)
+- `x` : latest Nextcloud x.x (e.g. `30`)
+- `x.x.x` : Nextcloud x.x.x (e.g. `30.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

@@ -7,11 +7,9 @@ and will receive the minor version updates and security patches.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 32. x   | :white_check_mark: |
-| 31. x   | :white_check_mark: |
-| 30. x   | :negative_squared_cross_mark |
-| 29. x   | :negative_squared_cross_mark: |
-| 28. x   | :negative_squared_cross_mark: |
+| 30. x   | :white_check_mark: |
+| 29. x   | :white_check_mark: |
+| 28. x   | :white_check_mark: |
 | 27. x   | :negative_squared_cross_mark: |
 | 26. x   | :negative_squared_cross_mark: |
 | 25. x   | :negative_squared_cross_mark: |

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

@@ -78,7 +78,7 @@ server {
             access_log off;
         }
 
-        location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$ {
+        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 /usr/bin/s6-svscan /etc/s6.d
+exec /bin/s6-svscan /etc/s6.d