Add images for Release Candidates

1 files changed, 24 insertions, 7 deletions

diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index a32e8c95..d7158620 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -16,12 +16,12 @@ dockerfileCommit() {
 	(
 		cd "$dir";
 		fileCommit Dockerfile \
-			$(git show HEAD:./Dockerfile | awk '
+			$(awk '
 				toupper($1) == "COPY" {
 					for (i = 2; i < NF; i++)
 							print $i;
 				}
-			')
+			' Dockerfile)
 	)
 }
 
@@ -57,8 +57,14 @@ join() {
 }
 
 latest=$( curl -fsSL 'https://download.nextcloud.com/server/releases/' |tac|tac| \
-	grep -oE 'nextcloud-[[:digit:]]+(.[[:digit:]]+)+' | \
-	grep -oE '[[:digit:]]+(.[[:digit:]]+)+' | \
+	grep -oE 'nextcloud-[[:digit:]]+(\.[[:digit:]]+){2}' | \
+	grep -oE '[[:digit:]]+(\.[[:digit:]]+){2}' | \
+	sort -uV | \
+	tail -1 )
+
+latest_rc=$( curl -fsSL 'https://download.nextcloud.com/server/prereleases/' |tac|tac| \
+	grep -oE 'nextcloud-[[:digit:]]+(\.[[:digit:]]+){2}RC[[:digit:]]+' | \
+	grep -oE '[[:digit:]]+(\.[[:digit:]]+){2}RC[[:digit:]]+' | \
 	sort -uV | \
 	tail -1 )
 
@@ -72,12 +78,23 @@ for version in "${versions[@]}"; do
 	done) )
 	for variant in "${variants[@]}"; do
 		commit="$(dockerfileCommit "$version/$variant")"
-		fullversion="$(git show "$commit":"$version/$variant/Dockerfile" | awk '$1 == "ENV" && $2 == "NEXTCLOUD_VERSION" { print $3; exit }')"
+		fullversion_with_extension="$( awk '$1 == "ENV" && $2 == "NEXTCLOUD_VERSION" { print $3; exit }' "$version/$variant/Dockerfile" )"
+		fullversion="$( echo "$fullversion_with_extension" | grep -oE '[[:digit:]]+(\.[[:digit:]]+){2}')"
+
+		versionAliases=( )
+		versionPostfix=""
+		if [ "$fullversion_with_extension" != "$fullversion" ]; then
+			versionAliases=( "$fullversion_with_extension" )
+			versionPostfix="-rc"
+		fi
 
-		versionAliases=( "$fullversion" "${fullversion%.*}" "${fullversion%.*.*}" )
-		if [ "$fullversion" = "$latest" ]; then
+		versionAliases+=( "$fullversion$versionPostfix" "${fullversion%.*}$versionPostfix" "${fullversion%.*.*}$versionPostfix" )
+		if [ "$fullversion_with_extension" = "$latest" ]; then
 			versionAliases+=( "latest" )
 		fi
+		if [ "$fullversion_with_extension" = "$latest_rc" ]; then
+			versionAliases+=( "rc" )
+		fi
 
 		variantAliases=( "${versionAliases[@]/%/-$variant}" )
 		variantAliases=( "${variantAliases[@]//latest-}" )