Merge 55aa61ac98 into f413890332

Signed-off-by: J0WI <J0WI@users.noreply.github.com>

28/apache/Dockerfile

@@ -140,7 +140,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 28.0.12
+ENV NEXTCLOUD_VERSION 28.0.14
 
 RUN set -ex; \
     fetchDeps=" \
@@ -150,8 +150,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

28/fpm-alpine/Dockerfile

@@ -120,7 +120,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 28.0.12
+ENV NEXTCLOUD_VERSION 28.0.14
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -128,8 +128,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

28/fpm/Dockerfile

@@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 28.0.12
+ENV NEXTCLOUD_VERSION 28.0.14
 
 RUN set -ex; \
     fetchDeps=" \
@@ -135,8 +135,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

30/apache/Dockerfile

@@ -140,7 +140,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 30.0.2
+ENV NEXTCLOUD_VERSION 30.0.4
 
 RUN set -ex; \
     fetchDeps=" \
@@ -150,8 +150,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

30/fpm-alpine/Dockerfile

@@ -120,7 +120,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 30.0.2
+ENV NEXTCLOUD_VERSION 30.0.4
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -128,8 +128,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

30/fpm/Dockerfile

@@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 30.0.2
+ENV NEXTCLOUD_VERSION 30.0.4
 
 RUN set -ex; \
     fetchDeps=" \
@@ -135,8 +135,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

generate-stackbrew-library.sh

@@ -70,6 +70,24 @@ latest=$( cat latest.txt )
 versions=( */ )
 versions=( "${versions[@]%/}" )
 for version in "${versions[@]}"; do
+
+	if [ "$version" = "notify_push" ]; then
+		commit="$(dockerfileCommit "$version")"
+		fullversion="$( awk '$1 == "ENV" && $2 == "NOTIFY_PUSH_VERSION" { print $3; exit }' "$version/Dockerfile" )"
+		versionAliases=( "$fullversion" "${fullversion%.*}" "${fullversion%.*.*}" )
+		variantAliases=( "${versionAliases[@]/%/-$version}" $version )
+
+		cat <<-EOE
+
+			Tags: $(join ', ' "${variantAliases[@]}")
+			Architectures: amd64, arm32v7, arm64v8
+			GitCommit: $commit
+			Directory: $version
+		EOE
+
+		continue
+	fi
+
 	variants=( $version/*/ )
 	variants=( $(for variant in "${variants[@]%/}"; do
 		echo "$(basename "$variant")"

latest.txt

@@ -1 +1 @@
-30.0.2
+30.0.4

notify_push/Dockerfile

@@ -0,0 +1,27 @@
+FROM alpine:3.13
+
+RUN apk add --no-cache ca-certificates
+
+# https://github.com/nextcloud/notify_push/releases
+ENV NOTIFY_PUSH_VERSION 0.1.6
+
+RUN set -ex; \
+	\
+	apkArch="$(apk --print-arch)"; \
+	npTriplet="unknown-linux-musl"; \
+	case "$apkArch" in \
+		aarch64|x86_64) npArch="$apkArch" ;; \
+		armv7) npArch="$apkArch"; $npTriplet="${npTriplet}-eabihf" ;; \
+		*) echo >&2 "error: unsupported arch: $apkArch"; exit 1 ;; \
+	esac; \
+	\
+	wget -O /usr/local/bin/notify_push "https://github.com/nextcloud/notify_push/releases/download/v${NOTIFY_PUSH_VERSION}/notify_push-$npArch-$npTriplet"; \
+	\
+	chmod +x /usr/local/bin/notify_push; \
+	notify_push --version
+
+USER nobody
+
+EXPOSE 7867
+
+CMD ["notify_push"]

update.sh

@@ -71,6 +71,16 @@ imagick_version="$(
 		| tail -1
 )"
 
+notify_push_version="$(
+	git ls-remote --tags https://github.com/nextcloud/notify_push.git \
+		| cut -d/ -f3 \
+		| grep -vE -- '-rc|-b' \
+		| tr -d '^{}' \
+		| sed -E 's/^v//' \
+		| sort -V \
+		| tail -1
+)"
+
 declare -A pecl_versions=(
 	[APCu]="$apcu_version"
 	[memcached]="$memcached_version"
@@ -179,3 +189,6 @@ for version in "${versions[@]}"; do
 		done
 	fi
 done
+
+echo "updating notify_push $notify_push_version"
+sed -re 's/^ENV NOTIFY_PUSH_VERSION .*$/ENV NOTIFY_PUSH_VERSION '"$notify_push_version"'/;' -i "notify_push/Dockerfile"

versions.json

@@ -1,9 +1,9 @@
 {
   "30": {
     "branch": "30",
-    "version": "30.0.2",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc",
+    "version": "30.0.4",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc",
     "variants": {
       "apache": {
         "variant": "apache",
@@ -53,9 +53,9 @@
   },
   "28": {
     "branch": "28",
-    "version": "28.0.12",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc",
+    "version": "28.0.14",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2.asc",
     "variants": {
       "apache": {
         "variant": "apache",