Explorar o código

Merge pull request #1004 from infosiftr/assume-latest

Fix an assumption of repos having a "latest" tag
yosifkit %!s(int64=8) %!d(string=hai) anos
pai
achega
94f9285252
Modificáronse 1 ficheiros con 10 adicións e 3 borrados
  1. 10 3
      .template-helpers/variant.sh

+ 10 - 3
.template-helpers/variant.sh

@@ -56,13 +56,20 @@ for tag in "${tags[@]}"; do
 done
 done
 
 
 if [ "$text" ]; then
 if [ "$text" ]; then
-	baseImage="$(bashbrew cat -f '{{ .DockerFrom .TagEntry }}' "$repo":latest)"
-	baseImage="${baseImage%:*}"
+	buildpacks=
+	potentialTags="$(bashbrew list --uniq "$repo" | cut -d: -f2)"
+	for tag in $potentialTags; do
+		baseImage="$(bashbrew cat -f '{{ .ArchDockerFrom (.TagEntry.Architectures | first) .TagEntry }}' "$repo:$tag")"
+		case "$baseImage" in
+			buildpack-deps:*-*) ;; # "scm", "curl" -- not large images
+			buildpack-deps:*) buildpacks=1; break ;;
+		esac
+	done
 
 
 	echo
 	echo
 	echo
 	echo
 
 
-	if [ "$baseImage" = 'buildpack-deps' ]; then
+	if [ -n "$buildpacks" ]; then
 		f='variant-buildpacks.md'
 		f='variant-buildpacks.md'
 	else
 	else
 		f='variant.md'
 		f='variant.md'