Add arm64v8 to 7.13.1

Author: tianon

6/Dockerfile

@@ -2,6 +2,7 @@
 
 # This image re-bundles the Docker image from the upstream provider, Elastic.
 FROM docker.elastic.co/logstash/logstash:6.8.16@sha256:51a37b460f7f50810a4f83874564b02f536aa477a09b4aba2bf4add7ab95d3a6
+# Supported Bashbrew Architectures: amd64
 
 # The upstream image was built by:
 #   https://github.com/elastic/dockerfiles/tree/v6.8.16/logstash

7/Dockerfile

@@ -1,7 +1,8 @@
 # Logstash 7.13.1
 
 # This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/logstash/logstash:7.13.1@sha256:d5c5b27a698168d18266c013f5e1e1e957f1416e9f7af585b4203c726f678869
+FROM docker.elastic.co/logstash/logstash:7.13.1@sha256:f26530bab544ba481d6353ae5601fe7fa5e14f3fadf06524d99b8da801acc78f
+# Supported Bashbrew Architectures: amd64 arm64v8
 
 # The upstream image was built by:
 #   https://github.com/elastic/dockerfiles/tree/v7.13.1/logstash

Dockerfile.template

@@ -2,6 +2,7 @@
 
 # This image re-bundles the Docker image from the upstream provider, Elastic.
 FROM %%UPSTREAM_IMAGE_DIGEST%%
+# Supported Bashbrew Architectures: %%UPSTREAM_IMAGE_ARCHITECTURES%%
 
 # The upstream image was built by:
 #   %%UPSTREAM_DOCKERFILE_LINK%%

generate-stackbrew-library.sh

@@ -1,9 +1,5 @@
-#!/bin/bash
-set -eu
-
-declare -A aliases=(
-	#[5]='latest'
-)
+#!/usr/bin/env bash
+set -Eeuo pipefail
 
 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
@@ -54,47 +50,18 @@ join() {
 for version in "${versions[@]}"; do
 	commit="$(dirCommit "$version")"
 
-	# Strip suffix qualifiers from versions like "6.4.3-alpha1"
-	plainVersion="${version%-*}"
+	fullVersion="$(git show "$commit":"$version/Dockerfile" | awk '$1 == "FROM" && $2 ~ /^docker.elastic.co/ { gsub(/^[^:]+:|@.+$/, "", $2); print $2; exit }')"
 
-	fullVersion="$(git show "$commit":"$version/Dockerfile" | awk '$1 == "ENV" && $2 == "LOGSTASH_VERSION" { print $3; exit }')"
+	versionAliases=( $fullVersion )
+	# TODO decide whether to support X.Y aliases as well
 
-	versionAliases=()
-	if [ "${plainVersion%%.*}" -ge 6 ]; then
-		fullVersion="$(git show "$commit":"$version/Dockerfile" | awk '$1 == "FROM" && $2 ~ /^docker.elastic.co/ { gsub(/^[^:]+:|@.+$/, "", $2); print $2; exit }')"
-		versionAliases+=( $fullVersion )
-		# TODO decide whether to support X.Y aliases as well
-	else
-		while [ "$fullVersion" != "$version" -a "${fullVersion%[.-]*}" != "$fullVersion" ]; do
-			versionAliases+=( $fullVersion )
-			fullVersion="${fullVersion%[.-]*}"
-		done
-		versionAliases+=(
-			$version
-			${aliases[$version]:-}
-		)
-	fi
+	versionArches="$(git show "$commit":"$version/Dockerfile" | awk -F ': ' '$1 == "# Supported Bashbrew Architectures" { print $2; exit }')"
 
 	echo
 	cat <<-EOE
 		Tags: $(join ', ' "${versionAliases[@]}")
+		Architectures: $(join ', ' $versionArches)
 		GitCommit: $commit
 		Directory: $version
 	EOE
-
-	for variant in alpine; 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

update.sh

@@ -46,11 +46,57 @@ for version in "${versions[@]}"; do
 
 	# Parse image manifest for sha
 	authToken="$(curl -fsSL "https://docker-auth.elastic.co/auth?service=token-service&scope=repository:$upstreamImageRepo:pull" | jq -r .token)"
-	digest="$(curl --head -fsSL -H 'Accept: application/vnd.docker.distribution.manifest.v2+json' -H "Authorization: Bearer $authToken" "https://docker.elastic.co/v2/$upstreamImageRepo/manifests/$fullVersion" | tr -d '\r' | gawk -F ':[[:space:]]+' 'tolower($1) == "docker-content-digest" { print $2 }')"
+	manifestList="$(
+		curl -D- -fsSL \
+			-H 'Accept: application/vnd.docker.distribution.manifest.list.v2+json' \
+			-H 'Accept: application/vnd.docker.distribution.manifest.v2+json' \
+			-H "Authorization: Bearer $authToken" \
+			"https://docker.elastic.co/v2/$upstreamImageRepo/manifests/$fullVersion" \
+			| tr -d '\r'
+	)"
+	digest="$(gawk -F ':[[:space:]]+' 'tolower($1) == "docker-content-digest" { print $2; exit }' <<<"$manifestList")"
+	manifestList="$(gawk '/^$/ { pre = 1; next } pre { print }' <<<"$manifestList")"
 
 	# Format image reference (image@sha)
 	upstreamImageDigest="$upstreamImage@$digest"
 
+	schemaVersion="$(jq -r '.schemaVersion' <<<"$manifestList")"
+	[ "$schemaVersion" = 2 ] # sanity check
+	mediaType="$(jq -r '.mediaType' <<<"$manifestList")"
+	case "$mediaType" in
+		'application/vnd.docker.distribution.manifest.v2+json')
+			upstreamImageArchitectures='amd64'
+			;;
+
+		'application/vnd.docker.distribution.manifest.list.v2+json')
+			upstreamImageArchitectures="$(
+				jq -r '
+					.manifests[].platform
+					| if .os != "linux" then
+						.os + "-"
+					else "" end
+					+ if .architecture == "arm" then
+						"arm32"
+					elif .architecture == "386" then
+						"i386"
+					else .architecture end
+					+ if .variant then
+						.variant
+					elif .architecture == "arm64" then
+						"v8"
+					else "" end
+				' <<<"$manifestList" \
+				| sort -u \
+				| xargs
+			)"
+			;;
+
+		*)
+			echo >&2 "error: unknown media type on '$upstreamImageDigest': '$mediaType'"
+			exit 1
+			;;
+	esac
+
 	upstreamDockerfileTag="v$fullVersion"
 	upstreamDockerfileLink="https://github.com/elastic/dockerfiles/tree/$upstreamDockerfileTag/$upstreamProduct"
 	upstreamDockerfile="${upstreamDockerfileLink//tree/raw}/Dockerfile"
@@ -65,6 +111,7 @@ for version in "${versions[@]}"; do
 
 	sed -e 's!%%VERSION%%!'"$fullVersion"'!g' \
 		-e 's!%%UPSTREAM_IMAGE_DIGEST%%!'"$upstreamImageDigest"'!g' \
+		-e 's!%%UPSTREAM_IMAGE_ARCHITECTURES%%!'"$upstreamImageArchitectures"'!g' \
 		-e 's!%%UPSTREAM_DOCKERFILE_LINK%%!'"$upstreamDockerfileLink"'!g' \
 		-e 's!%%UPSTREAM_DOCKER_BUILD%%!'"$upstreamDockerBuild"'!g' \
 		Dockerfile.template > "$version/Dockerfile"