Merge 38b9fc3721 into 3451a6219a

.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'

Dockerfile

@@ -1,5 +1,5 @@
 # -------------- Build-time variables --------------
-ARG NEXTCLOUD_VERSION=30.0.12
+ARG NEXTCLOUD_VERSION=30.0.4
 ARG PHP_VERSION=8.3
 ARG NGINX_VERSION=1.26
 
@@ -10,8 +10,8 @@ ARG SNUFFLEUPAGUS_VERSION=0.10.0
 ARG UID=1000
 ARG GID=1000
 
-# nextcloud-30.0.12.tar.bz2
-ARG SHA256_SUM="9e19b25f42273d4361218426b4762a766bee408cfa6aa8219f8c27f72095a7a8"
+# 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"
@@ -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 \