Merge 35725bd4eb into 35f8a4f1ae

Allow running CI pipelines on version-branches and still (only) tag latest on
master branch

.github/workflows/build.yml

@@ -3,9 +3,9 @@ name: build
 on:
   workflow_dispatch:
   push:
-    branches:
-      - master
-      - version-*
+    branches: 
+     - master
+     - version-* 
   schedule:
     # Build the image regularly (each Friday)
     - cron: '23 04 * * 5'
@@ -29,11 +29,14 @@ jobs:
 
       - name: Extract version for tags
         run: |
-          BRANCH="${GITHUB_REF#refs/heads/}"
-          VERSION=$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile)
-          [ "$BRANCH" = "master" ] && echo "BRANCH_VERSION=latest" >> $GITHUB_ENV
-          echo "FULL_VERSION=${VERSION:0:7}" >> $GITHUB_ENV
-          echo "MAJOR_VERSION=${VERSION:0:2}" >> $GITHUB_ENV
+          if [[ "$GITHUB_REF" == refs/heads/* ]]; then
+            BRANCH="${GITHUB_REF#refs/heads/}"
+            if [ "$BRANCH" = "master" ]; then
+              echo "BRANCH_VERSION=latest" >> $GITHUB_ENV
+            fi
+          fi
+          echo "FULL_VERSION=$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c6)" >> $GITHUB_ENV
+          echo "MAJOR_VERSION=$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c2)" >> $GITHUB_ENV
 
       - name: Install cosign
         if: github.event_name != 'pull_request'

Dockerfile

@@ -1,17 +1,17 @@
 # -------------- Build-time variables --------------
-ARG NEXTCLOUD_VERSION=28.0.14
+ARG NEXTCLOUD_VERSION=28.0.4
 ARG PHP_VERSION=8.2
-ARG NGINX_VERSION=1.26
+ARG NGINX_VERSION=1.24
 
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.19
 ARG HARDENED_MALLOC_VERSION=11
 ARG SNUFFLEUPAGUS_VERSION=0.10.0
 
 ARG UID=1000
 ARG GID=1000
 
-# nextcloud-28.0.14.tar.bz2
-ARG SHA256_SUM="4a937f1882486426c9703e59ec4b293f621be8d080b7f85016f629903c3af336"
+# nextcloud-28.0.4.tar.bz2
+ARG SHA256_SUM="9bfecee1e12fba48c49e9a71caa81c4ba10b2884787fab75d64ccfd122a13019"
 
 # Nextcloud Security <security@nextcloud.com> (D75899B9A724937A)
 ARG GPG_FINGERPRINT="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"

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

@@ -72,7 +72,7 @@ server {
             access_log off;
         }
 
-        location ~ \.(otf|woff2)?$ {
+        location ~ \.woff2?$ {
             try_files $uri /index.php$uri$is_args$args;
             expires 7d;
             access_log off;