Rename "8.3" to "8.3-rc" (matching other docker-library repo conventions) and update supporting scripts

Author: tianon

.travis.yml

@@ -2,10 +2,10 @@ language: bash
 services: docker
 
 env:
+  - VERSION=8.3-rc VARIANT=apache
+  - VERSION=8.3-rc VARIANT=fpm
   - VERSION=8.2 VARIANT=apache
   - VERSION=8.2 VARIANT=fpm
-  - VERSION=8.3 VARIANT=apache
-  - VERSION=8.3 VARIANT=fpm
   - VERSION=7 VARIANT=apache
   - VERSION=7 VARIANT=fpm
 

8.3/apache/Dockerfile renamed to 8.3-rc/apache/Dockerfile

@@ -3,6 +3,7 @@ set -eu
 
 declare -A aliases=(
 	[8.2]='8 latest'
+	[8.3-rc]='rc'
 )
 
 self="$(basename "$BASH_SOURCE")"
@@ -52,15 +53,16 @@ join() {
 }
 
 for version in "${versions[@]}"; do
+	rcVersion="${version%-rc}"
 	for variant in apache fpm; do
 		commit="$(dirCommit "$version/$variant")"
 
 		fullVersion="$(git show "$commit":"$version/$variant/Dockerfile" | awk '$1 == "ENV" && $2 == "DRUPAL_VERSION" { print $3; exit }')"
 
 		versionAliases=()
-		while [ "$fullVersion" != "$version" -a "${fullVersion%[.-]*}" != "$fullVersion" ]; do
+		while [ "$fullVersion" != "$rcVersion" -a "${fullVersion%[.]*}" != "$fullVersion" ]; do
 			versionAliases+=( $fullVersion )
-			fullVersion="${fullVersion%[.-]*}"
+			fullVersion="${fullVersion%[.]*}"
 		done
 		versionAliases+=(
 			$version

8.3/fpm/Dockerfile renamed to 8.3-rc/fpm/Dockerfile

@@ -9,11 +9,26 @@ if [ ${#versions[@]} -eq 0 ]; then
 fi
 versions=( "${versions[@]%/}" )
 
-curl -fSL 'https://www.drupal.org/node/3060/release' -o release
+curl -fsSL 'https://www.drupal.org/node/3060/release' -o release
+trap 'rm -f release' EXIT
 
 travisEnv=
 for version in "${versions[@]}"; do
-	fullVersion="$(grep -E '>drupal-'"$version"'\.[0-9a-z.-]+\.tar\.gz<' release | sed -r 's!.*<a[^>]+>drupal-([^<]+)\.tar\.gz</a>.*!\1!' | head -1)"
+	rcGrepV='-v'
+	rcVersion="${version%-rc}"
+	if [ "$rcVersion" != "$version" ]; then
+		rcGrepV=
+	fi
+	fullVersion="$(
+		grep -E '>drupal-'"$rcVersion"'\.[0-9a-z.-]+\.tar\.gz<' release \
+			| sed -r 's!.*<a[^>]+>drupal-([^<]+)\.tar\.gz</a>.*!\1!' \
+			| grep $rcGrepV -E -- '-rc|-beta|-alpha|-dev' \
+			| head -1
+	)"
+	if [ -z "$fullVersion" ]; then
+		echo >&2 "error: cannot find release for $version"
+		exit 1
+	fi
 	md5="$(grep -A6 -m1 '>drupal-'"$fullVersion"'.tar.gz<' release | grep -A1 -m1 '"md5 hash"' | tail -1 | awk '{ print $1 }')"
 
 	(
@@ -31,5 +46,3 @@ done
 
 travis="$(awk -v 'RS=\n\n' '$1 == "env:" { $0 = "env:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)"
 echo "$travis" > .travis.yml
-
-rm -f release