Merge branch 'docker-library:master' into master

Author: alombarte

.github/workflows/ci.yml

@@ -1,5 +1,8 @@
 name: GitHub CI
 
+permissions:
+  contents: read
+
 on:
   pull_request:
   push:
@@ -16,29 +19,29 @@ jobs:
   markdownfmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: docker pull tianon/markdownfmt
       - run: .ci/check-markdownfmt.sh
   ymlfmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: docker pull tianon/ymlfmt
       - run: .ci/check-ymlfmt.sh
   short:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: .ci/check-short.sh
   required-files:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: .ci/check-required-files.sh
   no-readme:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - run: .ci/check-pr-no-readme.sh

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

@@ -29,6 +29,8 @@ This template defines the "Supported tags and Dockerfile links" portion of an im
 	{{- $url := hasPrefix "https://github.com/" $repoUrlBase | ternary (join "/" $repoUrlBase "blob" $gitCommit $dockerfilePath) "" -}}
 	{{- /* handle https://gitlab.../.../... style URLs (by reasonably assuming they're a gitlab instance) */ -}}
 	{{- $url = $url | ternary $url (hasPrefix "https://gitlab." $repoUrlBase | ternary (join "/" $repoUrlBase "-/blob" $gitCommit $dockerfilePath) "") -}}
+	{{- /* handle https://git.launchpad.net/ URLs */ -}}
+	{{- $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 -}}
@@ -68,6 +70,8 @@ This template defines the "Supported tags and Dockerfile links" portion of an im
 				{{- $url := hasPrefix "https://github.com/" $repoUrlBase | ternary (join "/" $repoUrlBase "blob" $gitCommit $dockerfilePath) "" -}}
 				{{- /* handle https://gitlab.../.../... style URLs (by reasonably assuming they're a gitlab instance) */ -}}
 				{{- $url = $url | ternary $url (hasPrefix "https://gitlab." $repoUrlBase | ternary (join "/" $repoUrlBase "-/blob" $gitCommit $dockerfilePath) "") -}}
+				{{- /* handle https://git.launchpad.net/ URLs */ -}}
+				{{- $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 */ -}}
 
 				{{- "\t-\t" -}}

.template-helpers/get-help.md

@@ -1 +1 @@
-[the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://dockr.ly/slack), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker)
+[the Docker Community Slack](https://dockr.ly/comm-slack), [Server Fault](https://serverfault.com/help/on-topic), [Unix & Linux](https://unix.stackexchange.com/help/on-topic), or [Stack Overflow](https://stackoverflow.com/help/on-topic)

.template-helpers/variant.sh

@@ -102,7 +102,7 @@ if [ -n "$text" ]; then
 	default+=$'\n' # parameter expansion eats the trailing newline
 
 	if [ "$repo" != 'debian' ] && [ "$repo" != 'ubuntu' ]; then
-		# what is 'jessie', 'stretch' and 'sid'
+		# what is 'bullseye', 'buster' and 'sid'
 		# https://github.com/docker-library/python/issues/343
 		debian=( $(bashbrew list --uniq "$(_repo 'debian')" | grep -vE 'stable|slim|backports|experimental|testing' | cut -d: -f2) )
 		ubuntu=( $(bashbrew list "$(_repo 'ubuntu')" | grep -vE 'devel|latest|[0-9]' | cut -d: -f2) )

README.md

@@ -55,20 +55,20 @@ After opening your Pull Request the changes will be checked by an automated `mar
 
 # How do I add a new image's docs
 
--	create a folder for my image: `mkdir myimage`
--	create a `README-short.txt` (required, 100 char max)
--	create a `content.md` (required)
--	create a `license.md` (required)
--	create a `maintainer.md` (required)
--	create a `github-repo` (required)
--	add a `logo.png` (recommended)
+-	Create a folder for my image: `mkdir myimage`
+-	Create a `README-short.txt` (required, 100 char max)
+-	Create a `content.md` (required)
+-	Create a `license.md` (required)
+-	Create a `maintainer.md` (required)
+-	Create a `github-repo` (required)
+-	Add a `logo.png` (recommended)
 
 Optionally:
 
--	run `./markdownfmt.sh -l myimage` to list any files that are non-compliant to [`tianon/markdownfmt`](https://hub.docker.com/r/tianon/markdownfmt).  
+-	Run `./markdownfmt.sh -l myimage` to list any files that are non-compliant to [`tianon/markdownfmt`](https://hub.docker.com/r/tianon/markdownfmt).  
 	Any files in the list will result in a failed build during continuous integration.
 	-	run `./markdownfmt.sh -d myimage` to see a diff of changes required to pass.
--	run `./update.sh myimage` to generate `myimage/README.md` for manual review of the generated copy.  
+-	Run `./update.sh myimage` to generate `myimage/README.md` for manual review of the generated copy.  
 	**Note:** do not actually commit the `README.md` file; it is automatically generated/committed before being uploaded to Docker Hub.
 
 # Files related to an image's docs
@@ -164,7 +164,7 @@ The scripts and Markdown files in here are used in building an image's `README.m
 
 ## `generate-repo-stub-readme.sh`
 
-This is used to generate a simple `README.md` to put in the image's repo. We use this in Git repositories within https://github.com/docker-library to simplify our maintenance, but it is not required for anyone else. Argument is the name of the image, like `golang` and it then outputs the readme to standard out.
+This is used to generate a simple `README.md` to put in the image's repo. We use this in Git repositories within https://github.com/docker-library to simplify our maintenance, but it is not required for anyone else. The only argument is the name of the image (or repo), like `golang` and it then outputs the readme to standard out.
 
 ## `push.pl` and `push.sh`
 

adminer/README.md

@@ -20,12 +20,12 @@ WARNING:
 	[Tim Düsterhus (of the Docker Community)](https://github.com/TimWolla/docker-adminer)
 
 -	**Where to get help**:  
-	[the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://dockr.ly/slack), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker)
+	[the Docker Community Slack](https://dockr.ly/comm-slack), [Server Fault](https://serverfault.com/help/on-topic), [Unix & Linux](https://unix.stackexchange.com/help/on-topic), or [Stack Overflow](https://stackoverflow.com/help/on-topic)
 
 # Supported tags and respective `Dockerfile` links
 
--	[`4.8.1-standalone`, `4-standalone`, `standalone`, `4.8.1`, `4`, `latest`](https://github.com/TimWolla/docker-adminer/blob/0f6d3781a93e274faaee2020b110b7bf701dc5da/4/Dockerfile)
--	[`4.8.1-fastcgi`, `4-fastcgi`, `fastcgi`](https://github.com/TimWolla/docker-adminer/blob/0f6d3781a93e274faaee2020b110b7bf701dc5da/4/fastcgi/Dockerfile)
+-	[`4.8.1-standalone`, `4-standalone`, `standalone`, `4.8.1`, `4`, `latest`](https://github.com/TimWolla/docker-adminer/blob/655a0ba9445f62ee494bfe35be93e6730e7576af/4/Dockerfile)
+-	[`4.8.1-fastcgi`, `4-fastcgi`, `fastcgi`](https://github.com/TimWolla/docker-adminer/blob/655a0ba9445f62ee494bfe35be93e6730e7576af/4/fastcgi/Dockerfile)
 
 # Quick reference (cont.)
 

aerospike/README.md

@@ -20,12 +20,12 @@ WARNING:
 	[Aerospike, Inc.](https://github.com/aerospike/aerospike-server-enterprise.docker)
 
 -	**Where to get help**:  
-	[the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://dockr.ly/slack), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker)
+	[the Docker Community Slack](https://dockr.ly/comm-slack), [Server Fault](https://serverfault.com/help/on-topic), [Unix & Linux](https://unix.stackexchange.com/help/on-topic), or [Stack Overflow](https://stackoverflow.com/help/on-topic)
 
 # Supported tags and respective `Dockerfile` links
 
--	[`ee-5.7.0.8`](https://github.com/aerospike/aerospike-server-enterprise.docker/blob/2d11fe93cec1c1adc86968a26b1b8827f61dc81f/Dockerfile)
--	[`ce-5.7.0.8`](https://github.com/aerospike/aerospike-server.docker/blob/9316b9e2dca468e2bbed08e12550f5d208447a14/Dockerfile)
+-	[`ee-6.1.0.3`](https://github.com/aerospike/aerospike-server-enterprise.docker/blob/01871453aad7390a02a51dee11efe8e6a55f95cf/Dockerfile)
+-	[`ce-6.1.0.3`](https://github.com/aerospike/aerospike-server.docker/blob/4557452ca88bcad1929e91bd303b522a1c242b12/Dockerfile)
 
 # Quick reference (cont.)
 

almalinux/README.md

@@ -20,20 +20,22 @@ WARNING:
 	[The AlmaLinux OS Foundation](https://github.com/AlmaLinux/docker-images)
 
 -	**Where to get help**:  
-	[the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://dockr.ly/slack), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker)
+	[the Docker Community Slack](https://dockr.ly/comm-slack), [Server Fault](https://serverfault.com/help/on-topic), [Unix & Linux](https://unix.stackexchange.com/help/on-topic), or [Stack Overflow](https://stackoverflow.com/help/on-topic)
 
 # Supported tags and respective `Dockerfile` links
 
--	[`latest`, `8`, `8.5`, `8.5-20211112`](https://github.com/AlmaLinux/docker-images/blob/6e2df1f70f5c144198756f4be9a30e412e8bb065/Dockerfile)
--	[`minimal`, `8-minimal`, `8.5-minimal-20211112`](https://github.com/AlmaLinux/docker-images/blob/a5eb1823772e0154c96351879864d0badaf3c918/Dockerfile)
+-	[`latest`, `8`, `8.7`, `8.7-20221110`](https://github.com/AlmaLinux/docker-images/blob/8ab8e4aa3c25e7836bf777dae31545da8fd477f1/Dockerfile-x86_64-default)
+-	[`minimal`, `8-minimal`, `8.7-minimal`, `8.7-minimal-20221110`](https://github.com/AlmaLinux/docker-images/blob/8ab8e4aa3c25e7836bf777dae31545da8fd477f1/Dockerfile-x86_64-minimal)
+-	[`9`, `9.1`, `9.1-20221117`](https://github.com/AlmaLinux/docker-images/blob/aaecb5417032a91f1eb3204d85cb7a41bd90025b/Dockerfile-x86_64-default)
+-	[`9-minimal`, `9.1-minimal`, `9.1-minimal-20221117`](https://github.com/AlmaLinux/docker-images/blob/aaecb5417032a91f1eb3204d85cb7a41bd90025b/Dockerfile-x86_64-minimal)
 
 # Quick reference (cont.)
 
 -	**Where to file issues**:  
 	[https://bugs.almalinux.org](https://bugs.almalinux.org) or [GitHub](https://github.com/AlmaLinux/docker-images/issues)
 
 -	**Supported architectures**: ([more info](https://github.com/docker-library/official-images#architectures-other-than-amd64))  
-	[`amd64`](https://hub.docker.com/r/amd64/almalinux/), [`arm64v8`](https://hub.docker.com/r/arm64v8/almalinux/)
+	[`amd64`](https://hub.docker.com/r/amd64/almalinux/), [`arm64v8`](https://hub.docker.com/r/arm64v8/almalinux/), [`ppc64le`](https://hub.docker.com/r/ppc64le/almalinux/), [`s390x`](https://hub.docker.com/r/s390x/almalinux/)
 
 -	**Published image artifact details**:  
 	[repo-info repo's `repos/almalinux/` directory](https://github.com/docker-library/repo-info/blob/master/repos/almalinux) ([history](https://github.com/docker-library/repo-info/commits/master/repos/almalinux))  

alpine/README.md

@@ -20,15 +20,15 @@ WARNING:
 	[Natanael Copa](https://github.com/alpinelinux/docker-alpine) (an Alpine Linux maintainer)
 
 -	**Where to get help**:  
-	[the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://dockr.ly/slack), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker)
+	[the Docker Community Slack](https://dockr.ly/comm-slack), [Server Fault](https://serverfault.com/help/on-topic), [Unix & Linux](https://unix.stackexchange.com/help/on-topic), or [Stack Overflow](https://stackoverflow.com/help/on-topic)
 
 # Supported tags and respective `Dockerfile` links
 
--	[`20210804`, `edge`](https://github.com/alpinelinux/docker-alpine/blob/a29a148442aa2d6d13d3d87b224d058ec951ad46/x86_64/Dockerfile)
--	[`3.14.3`, `3.14`, `3`, `latest`](https://github.com/alpinelinux/docker-alpine/blob/b88b69a4da55c759a174176b9e8d1da8697fd709/x86_64/Dockerfile)
--	[`3.13.7`, `3.13`](https://github.com/alpinelinux/docker-alpine/blob/cdde2af5d054e84cb06f23bc99a1cf0827b25eff/x86_64/Dockerfile)
--	[`3.12.9`, `3.12`](https://github.com/alpinelinux/docker-alpine/blob/2793da4774fae12a67809b5956f6d70b02f99d79/x86_64/Dockerfile)
--	[`3.11.13`, `3.11`](https://github.com/alpinelinux/docker-alpine/blob/fd62af72be6e4a107fee6ac762dcf656503df075/x86_64/Dockerfile)
+-	[`20221110`, `edge`](https://github.com/alpinelinux/docker-alpine/blob/7161d59eb68a7a2e71df7b4137c1c9403107d8a6/x86_64/Dockerfile)
+-	[`3.17.0`, `3.17`, `3`, `latest`](https://github.com/alpinelinux/docker-alpine/blob/a791ed3b042cb15f4dda594dd2fb088dcb725542/x86_64/Dockerfile)
+-	[`3.16.3`, `3.16`](https://github.com/alpinelinux/docker-alpine/blob/00e486941da9720adfdc82ac0144af73818ae732/x86_64/Dockerfile)
+-	[`3.15.6`, `3.15`](https://github.com/alpinelinux/docker-alpine/blob/a9e802051a3a2ae7d6fdd32ff6f5b39e62240089/x86_64/Dockerfile)
+-	[`3.14.8`, `3.14`](https://github.com/alpinelinux/docker-alpine/blob/a6c74aa475f4bc471e72f527db6256d8c3a52434/x86_64/Dockerfile)
 
 # Quick reference (cont.)
 

alt/README.md

@@ -20,13 +20,13 @@ WARNING:
 	[The ALT Linux Team Cloud](https://github.com/alt-cloud/docker-brew-alt)
 
 -	**Where to get help**:  
-	[the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://dockr.ly/slack), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker)
+	[the Docker Community Slack](https://dockr.ly/comm-slack), [Server Fault](https://serverfault.com/help/on-topic), [Unix & Linux](https://unix.stackexchange.com/help/on-topic), or [Stack Overflow](https://stackoverflow.com/help/on-topic)
 
 # Supported tags and respective `Dockerfile` links
 
--	[`p10`, `latest`](https://github.com/alt-cloud/docker-brew-alt/blob/1a75b1d52e2557c9661a3571c94010d9bed575f5/x86_64/Dockerfile)
--	[`p9`](https://github.com/alt-cloud/docker-brew-alt/blob/a7ea0d6982b84310d7dce8dcc6dc2d41e8b42be1/x86_64/Dockerfile)
--	[`sisyphus`](https://github.com/alt-cloud/docker-brew-alt/blob/7ed716e37ee5da61ea41588e454c326ce59ab06a/x86_64/Dockerfile)
+-	[`p10`, `latest`](https://github.com/alt-cloud/docker-brew-alt/blob/b231d221f40d951338c30902735044a36bb1895f/x86_64/Dockerfile)
+-	[`p9`](https://github.com/alt-cloud/docker-brew-alt/blob/fa873ac1d6ad83275982565b82b67b009969fd6a/x86_64/Dockerfile)
+-	[`sisyphus`](https://github.com/alt-cloud/docker-brew-alt/blob/a7155b68c43e43d50c162e355946303abf76f7d8/x86_64/Dockerfile)
 
 # Quick reference (cont.)