Merge 35725bd4eb into 35f8a4f1ae

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

.github/workflows/build.yml

@@ -29,11 +29,14 @@ jobs:
 
       - name: Extract version for tags
         run: |
+          if [[ "$GITHUB_REF" == refs/heads/* ]]; then
             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 [ "$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=30.0.12
-ARG PHP_VERSION=8.3
-ARG NGINX_VERSION=1.26
+ARG NEXTCLOUD_VERSION=28.0.4
+ARG PHP_VERSION=8.2
+ARG NGINX_VERSION=1.24
 
-ARG ALPINE_VERSION=3.21
+ARG ALPINE_VERSION=3.19
 ARG HARDENED_MALLOC_VERSION=11
 ARG SNUFFLEUPAGUS_VERSION=0.10.0
 
 ARG UID=1000
 ARG GID=1000
 
-# nextcloud-30.0.12.tar.bz2
-ARG SHA256_SUM="9e19b25f42273d4361218426b4762a766bee408cfa6aa8219f8c27f72095a7a8"
+# 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"
@@ -22,8 +22,6 @@ FROM docker.io/library/php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION} as base
 
 ARG SNUFFLEUPAGUS_VERSION
 
-ENV IMAGICK_SHA 28f27044e435a2b203e32675e942eb8de620ee58
-
 RUN apk -U upgrade \
  && apk add -t build-deps \
         $PHPIZE_DEPS \
@@ -74,8 +72,7 @@ RUN apk -U upgrade \
  && pecl install smbclient \
  && pecl install APCu \
  && pecl install redis \
- && curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/${IMAGICK_SHA}.tar.gz && tar --strip-components=1 -xf /tmp/imagick.tar.gz && phpize && ./configure && make && make install \
- && apk add --no-cache --virtual .imagick-runtime-deps imagemagick \
+ && pecl install imagick \
  && docker-php-ext-enable \
         smbclient \
         redis \

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. `30`)
-- `x.x.x` : Nextcloud x.x.x (e.g. `30.0.0`)
+- `x` : latest Nextcloud x.x (e.g. `28`)
+- `x.x.x` : Nextcloud x.x.x (e.g. `28.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,10 +7,8 @@ and will receive the minor version updates and security patches.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 30. x   | :white_check_mark: |
-| 29. x   | :white_check_mark: |
 | 28. x   | :white_check_mark: |
-| 27. x   | :negative_squared_cross_mark: |
+| 27. x   | :white_check_mark: |
 | 26. x   | :negative_squared_cross_mark: |
 | 25. x   | :negative_squared_cross_mark: |
 | 24. x   | :negative_squared_cross_mark: |

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

@@ -30,8 +30,8 @@ server {
         }
 
         location ^~ /.well-known {
-            location = /.well-known/carddav   { return 301 $nc_proto://$host/remote.php/dav/; }
-            location = /.well-known/caldav    { return 301 $nc_proto://$host/remote.php/dav/; }
+            location = /.well-known/carddav   { return 301 $nc_proto://$host/remote.php/dav; }
+            location = /.well-known/caldav    { return 301 $nc_proto://$host/remote.php/dav; }
             location ^~ /.well-known          { return 301 $nc_proto://$host/index.php$uri;  }
             try_files $uri $uri/ =404;
         }
@@ -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;

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