Merge branch 'docker-library:master' into feature/add_zulu

Author: FDelporte

.ci/check-metadata.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+cd "$(dirname "$(readlink -f "$BASH_SOURCE")")/.."
+
+# metadata.sh takes directories with a 'metadata.json' in them
+# metadata.json is expected in every repo
+# "." so that the canonical source metadata.json is checked too
+./metadata.sh */ .

.ci/check-ymlfmt.sh

@@ -3,7 +3,7 @@ set -Eeuo pipefail
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")/.."
 
-files="$(find -name '*.yml' -not -path './.github/*')"
+files="$(find '(' -name '*.yml' -o -name '*.yaml' ')' -not -path './.github/*')"
 need=()
 needdiff=
 for f in $files; do

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/workflows/ci.yml

@@ -19,30 +19,35 @@ jobs:
   markdownfmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: docker pull tianon/markdownfmt
       - run: .ci/check-markdownfmt.sh
   ymlfmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: docker pull tianon/ymlfmt
       - run: .ci/check-ymlfmt.sh
   short:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: .ci/check-short.sh
   required-files:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: .ci/check-required-files.sh
   no-readme:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - run: .ci/check-pr-no-readme.sh
     if: ${{ github.event_name == 'pull_request' }}
+  metadata:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: .ci/check-metadata.sh

.template-helpers/compose.md

@@ -1,5 +1,5 @@
-... via [`docker-compose`](https://github.com/docker/compose)
+... via [`docker compose`](https://github.com/docker/compose)
 
-Example `docker-compose.yml` for `%%REPO%%`:
+Example `compose.yaml` for `%%REPO%%`:
 
-%%COMPOSE-YML%%
+%%COMPOSE-YAML%%

.template-helpers/generate-dockerfile-links-partial.sh

@@ -13,7 +13,7 @@ if [ -z "${BASHBREW_LIBRARY:-}" ]; then
 	repo="https://github.com/docker-library/official-images/raw/master/library/$repo"
 fi
 
-if [ -n "$ARCH_SPECIFIC_DOCS" ] && archTags="$(bashbrew cat --format '{{ range .Entries }}{{ if .HasArchitecture arch }}{{ .Tags | first }}{{ "\n" }}{{ end }}{{ end }}' "$repo")" && [ -z "$archTags" ]; then
+if [ -n "$ARCH_SPECIFIC_DOCS" ] && archTags="$(bashbrew list --uniq --arch-filter "$repo")" && [ -z "$archTags" ]; then
 	echo "**WARNING:** THIS IMAGE *IS NOT SUPPORTED* ON THE \`$BASHBREW_ARCH\` ARCHITECTURE"
 	exit
 fi

.template-helpers/generate-dockerfile-links-partial.tmpl

@@ -33,16 +33,13 @@ This template defines the "Supported tags and Dockerfile links" portion of an im
 	{{- $url = $url | ternary $url (hasPrefix "https://git.launchpad.net/" $repoUrlBase | ternary (print $repoUrlBase "/tree/" $dockerfilePath "?h=" ($e.ArchGitFetch $arch) "&id=" $gitCommit) "") -}}
 	{{- /* TODO decide what to do (if anything) about other non-GitHub repos with respect to URL */ -}}
 
-	{{- if $i -}}
-		{{- "\n" -}}
-	{{- end -}}
-
 	- {{- "\t" -}}
 	{{- if $url -}} [ {{- end -}}
 	` {{- $e.Tags | join "`, `" -}} `
 	{{- if $url -}} ]( {{- $url -}} ) {{- end -}}
+
+	{{- "\n\n" -}}
 {{- end -}}
-{{- "\n\n" -}}
 
 {{- if (len $sharedTagGroups) -}}
 	{{- "## Shared Tags\n\n" -}}
@@ -53,7 +50,7 @@ This template defines the "Supported tags and Dockerfile links" portion of an im
 		{{- if (len $entries) -}}
 			{{- "-\t`" -}}
 			{{ .SharedTags | join "`, `" }}
-			{{- "`:\n" -}}
+			{{- "`:\n\n" -}}
 
 			{{- range $i, $e := $entries -}}
 				{{- $arch := $archSpecific | ternary arch ($e.HasArchitecture arch | ternary arch ($e.Architectures | first)) -}}
@@ -81,6 +78,7 @@ This template defines the "Supported tags and Dockerfile links" portion of an im
 
 				{{- "\n" -}}
 			{{- end -}}
+			{{- "\n" -}}
 		{{- end -}}
 	{{- end -}}
 	{{- "\n" -}}

.template-helpers/issues.md

@@ -1 +1 @@
-[%%GITHUB-REPO%%/issues](%%GITHUB-REPO%%/issues)
+[%%GITHUB-REPO%%/issues](%%GITHUB-REPO%%/issues?q=)

.template-helpers/stack.md

@@ -1,8 +1,7 @@
 ## `%%IMAGE%%:<version>-windowsservercore`
 
-This image is based on [Windows Server Core (`microsoft/windowsservercore`)](https://hub.docker.com/r/microsoft/windowsservercore/). As such, it only works in places which that image does, such as Windows 10 Professional/Enterprise (Anniversary Edition) or Windows Server 2016.
+This image is based on [Windows Server Core (`mcr.microsoft.com/windows/servercore`)](https://hub.docker.com/r/microsoft/windows-servercore). As such, it only works in places which that image does, such as Windows 10 Professional/Enterprise (Anniversary Edition) or Windows Server 2016.
 
 For information about how to get Docker running on Windows, please see the relevant "Quick Start" guide provided by Microsoft:
 
--	[Windows Server Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_server)
--	[Windows 10 Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_10)
+-	[Windows Containers Quick Start](https://learn.microsoft.com/en-us/virtualization/windowscontainers/quick-start/set-up-environment?tabs=dockerce)