From 8fc5416c05b303fd4e6884011866487d13eac82c Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Tue, 6 Jun 2017 11:42:13 -0700
Subject: [PATCH] Use architecture-specific fields in link generation for now

(Displaying architecture information in a clean, simple way per-tag is still definitely a big WIP/unknown.)
---
 .../generate-dockerfile-links-partial.tmpl    | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/.template-helpers/generate-dockerfile-links-partial.tmpl b/.template-helpers/generate-dockerfile-links-partial.tmpl
index b48b65f64..5c13047a1 100644
--- a/.template-helpers/generate-dockerfile-links-partial.tmpl
+++ b/.template-helpers/generate-dockerfile-links-partial.tmpl
@@ -5,29 +5,34 @@ This template defines the "Supported tags and Dockerfile links" portion of an im
 */ -}}
 
 {{- define "dockerfilePath" -}}
-	{{- if ne .Directory "." -}}
-		{{- .Directory -}}
+	{{- $dir := .ArchDirectory arch -}}
+	{{- if ne $dir "." -}}
+		{{- $dir -}}
 		/
 	{{- end -}}
 	Dockerfile
 {{- end -}}
 
 {{- range $i, $e := $.Entries -}}
-	{{- /* force bashbrew to "fetch" the GitCommit so that it is fully resolved */ -}}
-	{{- $from := $.DockerFrom $e -}}
+	{{- if $e.HasArchitecture arch -}}
+		{{- /* force bashbrew to "fetch" the GitCommit so that it is fully resolved */ -}}
+		{{- $from := $.DockerFrom $e -}}
 
-	{{- $repoUrlBase := $e.GitRepo | replace "git://" "https://" | trimSuffixes ".git" -}}
-	{{- $isGitHub := hasPrefix "https://github.com/" $repoUrlBase -}}
+		{{- $gitRepo := $e.ArchGitRepo arch -}}
+		{{- $repoUrlBase := $gitRepo | replace "git://" "https://" | trimSuffixes ".git" -}}
+		{{- $isGitHub := hasPrefix "https://github.com/" $repoUrlBase -}}
 
-	{{- if $i -}}
-		{{- "\n" -}}
+		{{- if $i -}}
+			{{- "\n" -}}
+		{{- end -}}
+
+		- {{- "\t" -}}
+		{{- if $isGitHub -}} [ {{- end -}}
+		` {{- $e.Tags | join "`, `" -}} ` (* {{- template "dockerfilePath" $e -}} *)
+		{{- $gitCommit := $e.ArchGitCommit arch -}}
+		{{- if $isGitHub -}} ]( {{- $repoUrlBase -}} /blob/ {{- $gitCommit -}} / {{- template "dockerfilePath" $e -}} ) {{- end -}}
+		{{- /* TODO decide what to do (if anything) about non-GitHub repos with respect to URL */ -}}
 	{{- end -}}
-
-	- {{- "\t" -}}
-	{{- if $isGitHub -}} [ {{- end -}}
-	` {{- $e.Tags | join "`, `" -}} ` (* {{- template "dockerfilePath" $e -}} *)
-	{{- if $isGitHub -}} ]( {{- $repoUrlBase -}} /blob/ {{- $e.GitCommit -}} / {{- template "dockerfilePath" $e -}} ) {{- end -}}
-	{{- /* TODO decide what to do (if anything) about non-GitHub repos with respect to URL */ -}}
 {{- end -}}
 
 {{- "\n\n" -}}