From 1a40a541519d2181c6f8c5e47e35711b7a023722 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 25 Oct 2018 13:27:41 -0700 Subject: [PATCH] Add "ArchFile" for differing "File:" values --- .template-helpers/generate-dockerfile-links-partial.tmpl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.template-helpers/generate-dockerfile-links-partial.tmpl b/.template-helpers/generate-dockerfile-links-partial.tmpl index f77a52836..2d94be722 100644 --- a/.template-helpers/generate-dockerfile-links-partial.tmpl +++ b/.template-helpers/generate-dockerfile-links-partial.tmpl @@ -28,7 +28,8 @@ This template defines the "Supported tags and Dockerfile links" portion of an im - {{- "\t" -}} {{- if $isGitHub -}} [ {{- end -}} {{- $dir := .ArchDirectory $arch -}} - {{- $dockerfilePath := eq $dir "." | ternary "Dockerfile" (join "/" $dir "Dockerfile") -}} + {{- $dockerfile := .ArchFile $arch -}} + {{- $dockerfilePath := eq $dir "." | ternary $dockerfile (join "/" $dir $dockerfile) -}} ` {{- $e.Tags | join "`, `" -}} ` (* {{- $dockerfilePath -}} *) {{- $gitCommit := $e.ArchGitCommit $arch -}} {{- if $isGitHub -}} ]( {{- $repoUrlBase -}} /blob/ {{- $gitCommit -}} / {{- $dockerfilePath -}} ) {{- end -}} @@ -60,7 +61,8 @@ This template defines the "Supported tags and Dockerfile links" portion of an im {{- "\t-\t" -}} {{- if $isGitHub -}} [ {{- end -}} {{- $dir := .ArchDirectory $arch -}} - {{- $dockerfilePath := ternary "Dockerfile" (join "/" $dir "Dockerfile") (eq $dir ".") -}} + {{- $dockerfile := .ArchFile $arch -}} + {{- $dockerfilePath := eq $dir "." | ternary $dockerfile (join "/" $dir $dockerfile) -}} ` {{- $e.Tags | first -}} ` (* {{- $dockerfilePath -}} *) {{- $gitCommit := $e.ArchGitCommit $arch -}} {{- if $isGitHub -}} ]( {{- $repoUrlBase -}} /blob/ {{- $gitCommit -}} / {{- $dockerfilePath -}} ) {{- end -}}