Merge pull request #1073 from infosiftr/sharedtags-second

List "Shared Tags" after "Simple Tags", since they're usually less specific
This commit is contained in:
yosifkit 2017-11-22 15:01:25 -08:00 committed by GitHub
commit fe83059aa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 30 deletions

View File

@ -7,6 +7,37 @@ This template defines the "Supported tags and Dockerfile links" portion of an im
{{- $archSpecific := getenv "ARCH_SPECIFIC_DOCS" -}}
{{- $sharedTagGroups := .Manifest.GetSharedTagGroups -}}
{{- if (len $sharedTagGroups) -}}
{{- "## Simple Tags\n\n" -}}
{{- end -}}
{{- range $i, $e := $.Entries -}}
{{- $arch := $archSpecific | ternary arch ($e.HasArchitecture arch | ternary arch ($e.Architectures | first)) -}}
{{- if $e.HasArchitecture $arch -}}
{{- /* force bashbrew to "fetch" the GitCommit so that it is fully resolved */ -}}
{{- $from := $.ArchDockerFrom $arch $e -}}
{{- $gitRepo := $e.ArchGitRepo $arch -}}
{{- $repoUrlBase := $gitRepo | replace "git://" "https://" | trimSuffixes ".git" -}}
{{- $isGitHub := hasPrefix "https://github.com/" $repoUrlBase -}}
{{- if $i -}}
{{- "\n" -}}
{{- end -}}
- {{- "\t" -}}
{{- if $isGitHub -}} [ {{- end -}}
{{- $dir := .ArchDirectory $arch -}}
{{- $dockerfilePath := ternary "Dockerfile" (join "/" $dir "Dockerfile") (eq $dir ".") -}}
` {{- $e.Tags | join "`, `" -}} ` (* {{- $dockerfilePath -}} *)
{{- $gitCommit := $e.ArchGitCommit $arch -}}
{{- if $isGitHub -}} ]( {{- $repoUrlBase -}} /blob/ {{- $gitCommit -}} / {{- $dockerfilePath -}} ) {{- end -}}
{{- /* TODO decide what to do (if anything) about non-GitHub repos with respect to URL */ -}}
{{- end -}}
{{- end -}}
{{- "\n\n" -}}
{{- if (len $sharedTagGroups) -}}
{{- "## Shared Tags\n\n" -}}
@ -38,34 +69,5 @@ This template defines the "Supported tags and Dockerfile links" portion of an im
{{- end -}}
{{- end -}}
{{- end -}}
{{- "\n## Simple Tags\n\n" -}}
{{- "\n" -}}
{{- end -}}
{{- range $i, $e := $.Entries -}}
{{- $arch := $archSpecific | ternary arch ($e.HasArchitecture arch | ternary arch ($e.Architectures | first)) -}}
{{- if $e.HasArchitecture $arch -}}
{{- /* force bashbrew to "fetch" the GitCommit so that it is fully resolved */ -}}
{{- $from := $.ArchDockerFrom $arch $e -}}
{{- $gitRepo := $e.ArchGitRepo $arch -}}
{{- $repoUrlBase := $gitRepo | replace "git://" "https://" | trimSuffixes ".git" -}}
{{- $isGitHub := hasPrefix "https://github.com/" $repoUrlBase -}}
{{- if $i -}}
{{- "\n" -}}
{{- end -}}
- {{- "\t" -}}
{{- if $isGitHub -}} [ {{- end -}}
{{- $dir := .ArchDirectory $arch -}}
{{- $dockerfilePath := ternary "Dockerfile" (join "/" $dir "Dockerfile") (eq $dir ".") -}}
` {{- $e.Tags | join "`, `" -}} ` (* {{- $dockerfilePath -}} *)
{{- $gitCommit := $e.ArchGitCommit $arch -}}
{{- if $isGitHub -}} ]( {{- $repoUrlBase -}} /blob/ {{- $gitCommit -}} / {{- $dockerfilePath -}} ) {{- end -}}
{{- /* TODO decide what to do (if anything) about non-GitHub repos with respect to URL */ -}}
{{- end -}}
{{- end -}}
{{- "\n\n" -}}