Add explicit "cli" aliases and move "latest" to "dind" in 22.06+

Author: tianon

20.10/Dockerfile renamed to 20.10/cli/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker:{{ env.version }}
+FROM docker:{{ env.version }}-cli
 
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
 RUN set -eux; \

20.10/docker-entrypoint.sh renamed to 20.10/cli/docker-entrypoint.sh

@@ -1,3 +1,3 @@
-FROM docker:{{ env.version }}
+FROM docker:{{ env.version }}-cli
 
 RUN apk add --no-cache git

20.10/modprobe.sh renamed to 20.10/cli/modprobe.sh

@@ -36,11 +36,13 @@ for version; do
 		continue
 	fi
 
+	rm -rf "$version"
+
 	variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)"
 	eval "variants=( $variants )"
 
 	for variant in "${variants[@]}"; do
-		dir="$version${variant:+/$variant}"
+		dir="$version/$variant"
 
 		case "$variant" in
 			windows/*)
@@ -53,7 +55,7 @@ for version; do
 				;;
 
 			*)
-				template="Dockerfile${variant:+-$variant}.template"
+				template="Dockerfile-$variant.template"
 				;;
 		esac
 
@@ -64,6 +66,6 @@ for version; do
 		} > "$dir/Dockerfile"
 	done
 
-	cp -a docker-entrypoint.sh modprobe.sh "$version/"
+	cp -a docker-entrypoint.sh modprobe.sh "$version/cli/"
 	cp -a dockerd-entrypoint.sh "$version/dind/"
 done

20.10/dind/Dockerfile

@@ -1,5 +1,5 @@
-#!/bin/bash
-set -eu
+#!/usr/bin/env bash
+set -Eeuo pipefail
 
 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
@@ -72,7 +72,7 @@ versionArches() {
 	fi
 
 	local parent parentArches
-	parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/Dockerfile")"
+	parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/cli/Dockerfile")"
 	parentArches="${parentRepoToArches[$parent]:-}"
 
 	comm -12 \
@@ -157,23 +157,35 @@ for version; do
 	variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)"
 	eval "variants=( $variants )"
 
+	case "$rcVersion" in
+		20.10) latestVariant='cli' ;;
+		*)     latestVariant='dind' ;;
+	esac
+
 	for v in "${variants[@]}"; do
-		dir="$version${v:+/$v}"
+		dir="$version/$v"
 		[ -f "$dir/Dockerfile" ] || continue
 
 		commit="$(dirCommit "$dir")"
 
 		variant="$(basename "$v")"
-		variantAliases=( "${versionAliases[@]/%/${variant:+-$variant}}" )
+		variantAliases=( "${versionAliases[@]/%/-$variant}" )
 		variantAliases=( "${variantAliases[@]//latest-/}" )
 
-		if [ "$variant" = '' ] || [ "$variant" = 'dind' ]; then
-			parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/Dockerfile")"
+		if [ "$variant" = 'cli' ] || [ "$variant" = 'dind' ]; then
+			parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/cli/Dockerfile")"
 			alpine="${parent#*:}" # "3.14"
 			suiteAliases=( "${variantAliases[0]}" ) # only "X.Y.Z-foo"
 			suiteAliases=( "${suiteAliases[@]/%/-alpine$alpine}" )
 			suiteAliases=( "${suiteAliases[@]//latest-/}" )
 			variantAliases+=( "${suiteAliases[@]}" )
+			if [ "$variant" = "$latestVariant" ]; then
+				# add "latest" aliases
+				suiteAliases=( "${versionAliases[0]}" ) # only "X.Y.Z-foo"
+				suiteAliases=( "${suiteAliases[@]/%/-alpine$alpine}" )
+				suiteAliases=( "${suiteAliases[@]//latest-/}" )
+				variantAliases+=( "${versionAliases[@]}" "${suiteAliases[@]}" )
+			fi
 		fi
 
 		sharedTags=()

20.10/git/Dockerfile

@@ -121,7 +121,7 @@
     },
     "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1",
     "variants": [
-      "",
+      "cli",
       "dind",
       "dind-rootless",
       "git",
@@ -254,7 +254,7 @@
     },
     "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1",
     "variants": [
-      "",
+      "cli",
       "dind",
       "dind-rootless",
       "git",

22.06-rc/Dockerfile renamed to 22.06-rc/cli/Dockerfile

@@ -250,7 +250,7 @@ for version in "${versions[@]}"; do
 
 	# order here controls the order of the library/ file
 	for variant in \
-		'' \
+		cli \
 		dind \
 		dind-rootless \
 		git \