Merge pull request #1503 from infosiftr/compact-tag-listing

Remove "Dockerfile path" from tags listing
This commit is contained in:
yosifkit 2019-06-13 15:10:58 -07:00 committed by GitHub
commit 4a9d1206a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -30,7 +30,7 @@ This template defines the "Supported tags and Dockerfile links" portion of an im
{{- $dir := .ArchDirectory $arch -}} {{- $dir := .ArchDirectory $arch -}}
{{- $dockerfile := .ArchFile $arch -}} {{- $dockerfile := .ArchFile $arch -}}
{{- $dockerfilePath := eq $dir "." | ternary $dockerfile (join "/" $dir $dockerfile) -}} {{- $dockerfilePath := eq $dir "." | ternary $dockerfile (join "/" $dir $dockerfile) -}}
` {{- $e.Tags | join "`, `" -}} ` (* {{- $dockerfilePath -}} *) ` {{- $e.Tags | join "`, `" -}} `
{{- $gitCommit := $e.ArchGitCommit $arch -}} {{- $gitCommit := $e.ArchGitCommit $arch -}}
{{- if $isGitHub -}} ]( {{- $repoUrlBase -}} /blob/ {{- $gitCommit -}} / {{- $dockerfilePath -}} ) {{- end -}} {{- if $isGitHub -}} ]( {{- $repoUrlBase -}} /blob/ {{- $gitCommit -}} / {{- $dockerfilePath -}} ) {{- end -}}
{{- /* TODO decide what to do (if anything) about non-GitHub repos with respect to URL */ -}} {{- /* TODO decide what to do (if anything) about non-GitHub repos with respect to URL */ -}}
@ -63,7 +63,7 @@ This template defines the "Supported tags and Dockerfile links" portion of an im
{{- $dir := .ArchDirectory $arch -}} {{- $dir := .ArchDirectory $arch -}}
{{- $dockerfile := .ArchFile $arch -}} {{- $dockerfile := .ArchFile $arch -}}
{{- $dockerfilePath := eq $dir "." | ternary $dockerfile (join "/" $dir $dockerfile) -}} {{- $dockerfilePath := eq $dir "." | ternary $dockerfile (join "/" $dir $dockerfile) -}}
` {{- $e.Tags | first -}} ` (* {{- $dockerfilePath -}} *) ` {{- $e.Tags | first -}} `
{{- $gitCommit := $e.ArchGitCommit $arch -}} {{- $gitCommit := $e.ArchGitCommit $arch -}}
{{- if $isGitHub -}} ]( {{- $repoUrlBase -}} /blob/ {{- $gitCommit -}} / {{- $dockerfilePath -}} ) {{- end -}} {{- if $isGitHub -}} ]( {{- $repoUrlBase -}} /blob/ {{- $gitCommit -}} / {{- $dockerfilePath -}} ) {{- end -}}
{{- /* TODO decide what to do (if anything) about non-GitHub repos with respect to URL */ -}} {{- /* TODO decide what to do (if anything) about non-GitHub repos with respect to URL */ -}}