Merge 374ef997fa into 921eec5693

(See https://docs.docker.com/reference/build-checks/legacy-key-value-format/)

Dockerfile

@@ -1,27 +1,29 @@
 # -------------- Build-time variables --------------
-ARG NEXTCLOUD_VERSION=29.0.7
-ARG PHP_VERSION=8.2
+ARG NEXTCLOUD_VERSION=30.0.6
+ARG PHP_VERSION=8.3
 ARG NGINX_VERSION=1.26
 
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.21
 ARG HARDENED_MALLOC_VERSION=11
 ARG SNUFFLEUPAGUS_VERSION=0.10.0
 
 ARG UID=1000
 ARG GID=1000
 
-# nextcloud-29.0.7.tar.bz2
-ARG SHA256_SUM="f532ffc31be5a8374b5e072b86fff8765ec19fda0c8509cee39873081db2c544"
+# nextcloud-30.0.6.tar.bz2
+ARG SHA256_SUM="ac0e091be6920965dc0c82f149b632d6b5ade7adee84a7b3c8cfd847450a8ddc"
 
 # 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
 
+ENV IMAGICK_SHA=28f27044e435a2b203e32675e942eb8de620ee58
+
 RUN apk -U upgrade \
  && apk add -t build-deps \
         $PHPIZE_DEPS \
@@ -72,7 +74,8 @@ RUN apk -U upgrade \
  && pecl install smbclient \
  && pecl install APCu \
  && pecl install redis \
- && pecl install imagick \
+ && 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 \
  && docker-php-ext-enable \
         smbclient \
         redis \
@@ -85,7 +88,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 +102,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. `29`)
-- `x.x.x` : Nextcloud x.x.x (e.g. `29.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,9 +7,10 @@ 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   | :white_check_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: |

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

@@ -72,7 +72,7 @@ server {
             access_log off;
         }
 
-        location ~ \.woff2?$ {
+        location ~ \.(otf|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 /bin/s6-svscan /etc/s6.d
+exec /usr/bin/s6-svscan /etc/s6.d