Update repository structure for future multi-version support

Author: tianon

.travis.yml

@@ -1,18 +1,22 @@
 language: bash
 services: docker
 
+env:
+  - VERSION=3.6
+
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
 
 before_script:
   - env | sort
-  - image='rabbitmq'
+  - cd "$VERSION"
+  - image="rabbitmq:$VERSION"
 
 script:
   - docker build -t "$image" .
   - ~/official-images/test/run.sh "$image"
-  - docker build -t "$image:management" management
-  - ~/official-images/test/run.sh "$image:management"
+  - docker build -t "${image}-management" management
+  - ~/official-images/test/run.sh "${image}-management"
 
 after_script:
   - docker images

Dockerfile renamed to 3.6/Dockerfile

@@ -1,9 +1,19 @@
 #!/bin/bash
 set -eu
 
+declare -A aliases=(
+	[3.6]='3 latest'
+)
+
 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
+versions=( */ )
+versions=( "${versions[@]%/}" )
+
+# sort version numbers with highest first
+IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -rV) ); unset IFS
+
 # get the most recent commit which modified any of "$@"
 fileCommit() {
 	git log -1 --format='format:%H' HEAD -- "$@"
@@ -41,33 +51,41 @@ join() {
 	echo "${out#$sep}"
 }
 
-commit="$(dirCommit .)"
-
-fullVersion="$(git show "$commit":Dockerfile | awk '$1 == "ENV" && $2 == "RABBITMQ_VERSION" { print $3; exit }')"
-
-versionAliases=()
-while [ "${fullVersion%.*}" != "$fullVersion" ]; do
-	versionAliases+=( $fullVersion )
-	fullVersion="${fullVersion%.*}"
-done
-versionAliases+=( $fullVersion latest )
-
-echo
-cat <<-EOE
-	Tags: $(join ', ' "${versionAliases[@]}")
-	GitCommit: $commit
-EOE
+for version in "${versions[@]}"; do
+	commit="$(dirCommit "$version")"
 
-for variant in management; do
-	commit="$(dirCommit "$variant")"
+	fullVersion="$(git show "$commit":"$version/Dockerfile" | awk '$1 == "ENV" && $2 == "RABBITMQ_VERSION" { print $3; exit }')"
 
-	variantAliases=( "${versionAliases[@]/%/-$variant}" )
-	variantAliases=( "${variantAliases[@]//latest-/}" )
+	versionAliases=()
+	while [ "$fullVersion" != "$version" -a "${fullVersion%[.-]*}" != "$fullVersion" ]; do
+		versionAliases+=( $fullVersion )
+		fullVersion="${fullVersion%[.-]*}"
+	done
+	versionAliases+=(
+		$version
+		${aliases[$version]:-}
+	)
 
 	echo
 	cat <<-EOE
-		Tags: $(join ', ' "${variantAliases[@]}")
+		Tags: $(join ', ' "${versionAliases[@]}")
 		GitCommit: $commit
-		Directory: $variant
+		Directory: $version
 	EOE
+
+	for variant in management; do
+		[ -f "$version/$variant/Dockerfile" ] || continue
+
+		commit="$(dirCommit "$version/$variant")"
+
+		variantAliases=( "${versionAliases[@]/%/-$variant}" )
+		variantAliases=( "${variantAliases[@]//latest-/}" )
+
+		echo
+		cat <<-EOE
+			Tags: $(join ', ' "${variantAliases[@]}")
+			GitCommit: $commit
+			Directory: $version/$variant
+		EOE
+	done
 done

docker-entrypoint.sh renamed to 3.6/docker-entrypoint.sh

@@ -3,10 +3,33 @@ set -e
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
-debianVersion="$(curl -sSL 'http://www.rabbitmq.com/debian/dists/testing/main/binary-amd64/Packages' | grep -m1 -A10 '^Package: rabbitmq-server$' | grep -m1 '^Version: ' | cut -d' ' -f2)"
+versions=( "$@" )
+if [ ${#versions[@]} -eq 0 ]; then
+	versions=( */ )
+fi
+versions=( "${versions[@]%/}" )
 
-rabbitmqVersion="${debianVersion%%-*}"
+travisEnv=
+for version in "${versions[@]}"; do
+	# TODO figure out what multi-version looks like here? :(
+	debianVersion="$(curl -sSL 'http://www.rabbitmq.com/debian/dists/testing/main/binary-amd64/Packages' | grep -m1 -A10 '^Package: rabbitmq-server$' | grep -m1 '^Version: ' | cut -d' ' -f2)"
+	# https://github.com/docker-library/rabbitmq/pull/121#issuecomment-271816323
 
-set -x
-sed -ri 's/^(ENV RABBITMQ_VERSION) .*/\1 '"$rabbitmqVersion"'/' Dockerfile
-sed -ri 's/^(ENV RABBITMQ_DEBIAN_VERSION) .*/\1 '"$debianVersion"'/' Dockerfile
+	rabbitmqVersion="${debianVersion%%-*}"
+
+	if [[ "$rabbitmqVersion" != "$version".* ]]; then
+		echo >&2 "warning: $rabbitmqVersion doesn't appear to be $version -- skipping for now"
+		continue
+	fi
+
+	(
+		set -x
+		sed -ri 's/^(ENV RABBITMQ_VERSION) .*/\1 '"$rabbitmqVersion"'/' "$version/Dockerfile"
+		sed -ri 's/^(ENV RABBITMQ_DEBIAN_VERSION) .*/\1 '"$debianVersion"'/' "$version/Dockerfile"
+	)
+
+	travisEnv='\n  - VERSION='"$version$travisEnv"
+done
+
+travis="$(awk -v 'RS=\n\n' '$1 == "env:" { $0 = "env:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)"
+echo "$travis" > .travis.yml