浏览代码

Run update.sh

Docker Library Bot 5 年之前
父节点
当前提交
4db7c87d98
共有 12 个文件被更改,包括 61 次插入49 次删除
  1. 10 4
      drupal/README.md
  2. 3 3
      erlang/README.md
  3. 2 2
      flink/README.md
  4. 2 2
      ghost/README.md
  5. 6 9
      kong/README.md
  6. 4 2
      neo4j/README.md
  7. 9 9
      node/README.md
  8. 10 9
      openjdk/README.md
  9. 1 1
      percona/README.md
  10. 1 1
      photon/README.md
  11. 3 3
      redis/README.md
  12. 10 4
      wordpress/README.md

+ 10 - 4
drupal/README.md

@@ -221,13 +221,19 @@ The `drupal` images come in many flavors, each designed for a specific use case.
 
 
 This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of.
 This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of.
 
 
-## `drupal:<version>-alpine`
+## `drupal:<version>-fpm`
 
 
-This image is based on the popular [Alpine Linux project](https://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general.
+This variant contains PHP-FPM, which is a FastCGI implementation for PHP. See [the PHP-FPM website](https://php-fpm.org/) for more information about PHP-FPM.
 
 
-This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](https://musl.libc.org) instead of [glibc and friends](https://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images.
+In order to use this image variant, some kind of reverse proxy (such as NGINX, Apache, or other tool which speaks the FastCGI protocol) will be required.
 
 
-To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar).
+Some potentially helpful resources:
+
+-	[PHP-FPM.org](https://php-fpm.org/)
+-	[simplified example by @md5](https://gist.github.com/md5/d9206eacb5a0ff5d6be0)
+-	[very detailed article by Pascal Landau](https://www.pascallandau.com/blog/php-php-fpm-and-nginx-on-docker-in-windows-10/)
+-	[Stack Overflow discussion](https://stackoverflow.com/q/29905953/433558)
+-	[Apache httpd Wiki example](https://wiki.apache.org/httpd/PHPFPMWordpress)
 
 
 # License
 # License
 
 

+ 3 - 3
erlang/README.md

@@ -24,9 +24,9 @@ WARNING:
 
 
 # Supported tags and respective `Dockerfile` links
 # Supported tags and respective `Dockerfile` links
 
 
--	[`23.0.2`, `23.0`, `23`, `latest`](https://github.com/erlang/docker-erlang-otp/blob/ed3bd9400e1b72b2bdd08596990f8ed3350a75c0/23/Dockerfile)
--	[`23.0.2-slim`, `23.0-slim`, `23-slim`, `slim`](https://github.com/erlang/docker-erlang-otp/blob/ed3bd9400e1b72b2bdd08596990f8ed3350a75c0/23/slim/Dockerfile)
--	[`23.0.2-alpine`, `23.0-alpine`, `23-alpine`, `alpine`](https://github.com/erlang/docker-erlang-otp/blob/ed3bd9400e1b72b2bdd08596990f8ed3350a75c0/23/alpine/Dockerfile)
+-	[`23.0.3`, `23.0`, `23`, `latest`](https://github.com/erlang/docker-erlang-otp/blob/fe6eaa4c26a3f2d1050f37b2d3f4efed13e25f90/23/Dockerfile)
+-	[`23.0.3-slim`, `23.0-slim`, `23-slim`, `slim`](https://github.com/erlang/docker-erlang-otp/blob/fe6eaa4c26a3f2d1050f37b2d3f4efed13e25f90/23/slim/Dockerfile)
+-	[`23.0.3-alpine`, `23.0-alpine`, `23-alpine`, `alpine`](https://github.com/erlang/docker-erlang-otp/blob/fe6eaa4c26a3f2d1050f37b2d3f4efed13e25f90/23/alpine/Dockerfile)
 -	[`22.3.4.3`, `22.3.4`, `22.3`, `22`](https://github.com/erlang/docker-erlang-otp/blob/ad81251a67f669df6d613d5e0ed61d0654edc97b/22/Dockerfile)
 -	[`22.3.4.3`, `22.3.4`, `22.3`, `22`](https://github.com/erlang/docker-erlang-otp/blob/ad81251a67f669df6d613d5e0ed61d0654edc97b/22/Dockerfile)
 -	[`22.3.4.3-slim`, `22.3.4-slim`, `22.3-slim`, `22-slim`](https://github.com/erlang/docker-erlang-otp/blob/ad81251a67f669df6d613d5e0ed61d0654edc97b/22/slim/Dockerfile)
 -	[`22.3.4.3-slim`, `22.3.4-slim`, `22.3-slim`, `22-slim`](https://github.com/erlang/docker-erlang-otp/blob/ad81251a67f669df6d613d5e0ed61d0654edc97b/22/slim/Dockerfile)
 -	[`22.3.4.3-alpine`, `22.3.4-alpine`, `22.3-alpine`, `22-alpine`](https://github.com/erlang/docker-erlang-otp/blob/ad81251a67f669df6d613d5e0ed61d0654edc97b/22/alpine/Dockerfile)
 -	[`22.3.4.3-alpine`, `22.3.4-alpine`, `22.3-alpine`, `22-alpine`](https://github.com/erlang/docker-erlang-otp/blob/ad81251a67f669df6d613d5e0ed61d0654edc97b/22/alpine/Dockerfile)

+ 2 - 2
flink/README.md

@@ -26,8 +26,8 @@ WARNING:
 
 
 -	[`1.10.1-scala_2.11`, `1.10-scala_2.11`](https://github.com/apache/flink-docker/blob/31794825ad02db8b0eb961372c74a309a4504bcd/1.10/scala_2.11-debian/Dockerfile)
 -	[`1.10.1-scala_2.11`, `1.10-scala_2.11`](https://github.com/apache/flink-docker/blob/31794825ad02db8b0eb961372c74a309a4504bcd/1.10/scala_2.11-debian/Dockerfile)
 -	[`1.10.1-scala_2.12`, `1.10-scala_2.12`, `1.10.1`, `1.10`](https://github.com/apache/flink-docker/blob/31794825ad02db8b0eb961372c74a309a4504bcd/1.10/scala_2.12-debian/Dockerfile)
 -	[`1.10.1-scala_2.12`, `1.10-scala_2.12`, `1.10.1`, `1.10`](https://github.com/apache/flink-docker/blob/31794825ad02db8b0eb961372c74a309a4504bcd/1.10/scala_2.12-debian/Dockerfile)
--	[`1.11.0-scala_2.11`, `1.11-scala_2.11`, `scala_2.11`](https://github.com/apache/flink-docker/blob/949e445006c4fc288813900c264847d23d3e33d4/1.11/scala_2.11-debian/Dockerfile)
--	[`1.11.0-scala_2.12`, `1.11-scala_2.12`, `scala_2.12`, `1.11.0`, `1.11`, `latest`](https://github.com/apache/flink-docker/blob/949e445006c4fc288813900c264847d23d3e33d4/1.11/scala_2.12-debian/Dockerfile)
+-	[`1.11.1-scala_2.11`, `1.11-scala_2.11`, `scala_2.11`](https://github.com/apache/flink-docker/blob/253b8844a4bd96762ab14410624db4d7f3cc5f51/1.11/scala_2.11-debian/Dockerfile)
+-	[`1.11.1-scala_2.12`, `1.11-scala_2.12`, `scala_2.12`, `1.11.1`, `1.11`, `latest`](https://github.com/apache/flink-docker/blob/253b8844a4bd96762ab14410624db4d7f3cc5f51/1.11/scala_2.12-debian/Dockerfile)
 
 
 # Quick reference (cont.)
 # Quick reference (cont.)
 
 

+ 2 - 2
ghost/README.md

@@ -24,8 +24,8 @@ WARNING:
 
 
 # Supported tags and respective `Dockerfile` links
 # Supported tags and respective `Dockerfile` links
 
 
--	[`3.25.0`, `3.25`, `3`, `latest`](https://github.com/docker-library/ghost/blob/19ac24f6bab84417db48ff7e56db122a2ca6a76f/3/debian/Dockerfile)
--	[`3.25.0-alpine`, `3.25-alpine`, `3-alpine`, `alpine`](https://github.com/docker-library/ghost/blob/19ac24f6bab84417db48ff7e56db122a2ca6a76f/3/alpine/Dockerfile)
+-	[`3.26.0`, `3.26`, `3`, `latest`](https://github.com/docker-library/ghost/blob/92d7984a23e95d25270f6151cc129cd79f18051c/3/debian/Dockerfile)
+-	[`3.26.0-alpine`, `3.26-alpine`, `3-alpine`, `alpine`](https://github.com/docker-library/ghost/blob/92d7984a23e95d25270f6151cc129cd79f18051c/3/alpine/Dockerfile)
 -	[`2.38.2`, `2.38`, `2`](https://github.com/docker-library/ghost/blob/30d7c579647e33ca8c9ecac3a559c4a99a12cb73/2/debian/Dockerfile)
 -	[`2.38.2`, `2.38`, `2`](https://github.com/docker-library/ghost/blob/30d7c579647e33ca8c9ecac3a559c4a99a12cb73/2/debian/Dockerfile)
 -	[`2.38.2-alpine`, `2.38-alpine`, `2-alpine`](https://github.com/docker-library/ghost/blob/30d7c579647e33ca8c9ecac3a559c4a99a12cb73/2/alpine/Dockerfile)
 -	[`2.38.2-alpine`, `2.38-alpine`, `2-alpine`](https://github.com/docker-library/ghost/blob/30d7c579647e33ca8c9ecac3a559c4a99a12cb73/2/alpine/Dockerfile)
 
 

+ 6 - 9
kong/README.md

@@ -24,15 +24,12 @@ WARNING:
 
 
 # Supported tags and respective `Dockerfile` links
 # Supported tags and respective `Dockerfile` links
 
 
--	[`2.1.0-rc.1-alpine`, `2.1-alpine`, `2.1.0-rc.1`, `2.1`](https://github.com/Kong/docker-kong/blob/5b5169dff2834cc867f3156950c4e52eb0c907b2/alpine/Dockerfile)
--	[`2.1.0-rc.1-ubuntu`, `2.1-ubuntu`](https://github.com/Kong/docker-kong/blob/5b5169dff2834cc867f3156950c4e52eb0c907b2/ubuntu/Dockerfile)
--	[`2.1.0-rc.1-centos`, `2.1-centos`](https://github.com/Kong/docker-kong/blob/5b5169dff2834cc867f3156950c4e52eb0c907b2/centos/Dockerfile)
--	[`2.0.5-alpine`, `2.0.5`, `2.0`, `2`, `latest`, `alpine`](https://github.com/Kong/docker-kong/blob/60626098f2f32fe1528eb4ffacff13fd1c3e919f/alpine/Dockerfile)
--	[`2.0.5-ubuntu`, `2.0-ubuntu`, `ubuntu`](https://github.com/Kong/docker-kong/blob/60626098f2f32fe1528eb4ffacff13fd1c3e919f/ubuntu/Dockerfile)
--	[`2.0.5-centos`, `2.0-centos`, `centos`](https://github.com/Kong/docker-kong/blob/60626098f2f32fe1528eb4ffacff13fd1c3e919f/centos/Dockerfile)
--	[`1.5.1-alpine`, `1.5.1`, `1.5`, `1`](https://github.com/Kong/docker-kong/blob/8ba4389169d5873be65a09001d06293ccdfc7caf/alpine/Dockerfile)
--	[`1.5.1-ubuntu`, `1.5-ubuntu`](https://github.com/Kong/docker-kong/blob/8ba4389169d5873be65a09001d06293ccdfc7caf/ubuntu/Dockerfile)
--	[`1.5.1-centos`, `1.5-centos`](https://github.com/Kong/docker-kong/blob/8ba4389169d5873be65a09001d06293ccdfc7caf/centos/Dockerfile)
+-	[`2.1.0-alpine`, `2.1-alpine`, `2.1.0`, `2.1`, `2`, `alpine`, `latest`](https://github.com/Kong/docker-kong/blob/ab4e1d8a61d80e5884e940f76622f729e751f563/alpine/Dockerfile)
+-	[`2.1.0-ubuntu`, `2.1-ubuntu`, `ubuntu`](https://github.com/Kong/docker-kong/blob/ab4e1d8a61d80e5884e940f76622f729e751f563/ubuntu/Dockerfile)
+-	[`2.1.0-centos`, `2.1-centos`, `centos`](https://github.com/Kong/docker-kong/blob/ab4e1d8a61d80e5884e940f76622f729e751f563/centos/Dockerfile)
+-	[`2.0.5-alpine`, `2.0.5`, `2.0`](https://github.com/Kong/docker-kong/blob/60626098f2f32fe1528eb4ffacff13fd1c3e919f/alpine/Dockerfile)
+-	[`2.0.5-ubuntu`, `2.0-ubuntu`](https://github.com/Kong/docker-kong/blob/60626098f2f32fe1528eb4ffacff13fd1c3e919f/ubuntu/Dockerfile)
+-	[`2.0.5-centos`, `2.0-centos`](https://github.com/Kong/docker-kong/blob/60626098f2f32fe1528eb4ffacff13fd1c3e919f/centos/Dockerfile)
 
 
 # Quick reference (cont.)
 # Quick reference (cont.)
 
 

+ 4 - 2
neo4j/README.md

@@ -28,8 +28,10 @@ WARNING:
 -	[`4.1.1-enterprise`, `4.1-enterprise`, `enterprise`](https://github.com/neo4j/docker-neo4j-publish/blob/fa265c13d4c6fd8806ec1eed4792726ef8aa8987/4.1.1/enterprise/Dockerfile)
 -	[`4.1.1-enterprise`, `4.1-enterprise`, `enterprise`](https://github.com/neo4j/docker-neo4j-publish/blob/fa265c13d4c6fd8806ec1eed4792726ef8aa8987/4.1.1/enterprise/Dockerfile)
 -	[`4.1.0`](https://github.com/neo4j/docker-neo4j-publish/blob/c22866bb7f4baac356bf65494a003e490082b6c0/4.1.0/community/Dockerfile)
 -	[`4.1.0`](https://github.com/neo4j/docker-neo4j-publish/blob/c22866bb7f4baac356bf65494a003e490082b6c0/4.1.0/community/Dockerfile)
 -	[`4.1.0-enterprise`](https://github.com/neo4j/docker-neo4j-publish/blob/c22866bb7f4baac356bf65494a003e490082b6c0/4.1.0/enterprise/Dockerfile)
 -	[`4.1.0-enterprise`](https://github.com/neo4j/docker-neo4j-publish/blob/c22866bb7f4baac356bf65494a003e490082b6c0/4.1.0/enterprise/Dockerfile)
--	[`4.0.6`, `4.0`](https://github.com/neo4j/docker-neo4j-publish/blob/07dcb3dd43df67337f74af5a71decc45d50b712d/4.0.6/community/Dockerfile)
--	[`4.0.6-enterprise`, `4.0-enterprise`](https://github.com/neo4j/docker-neo4j-publish/blob/07dcb3dd43df67337f74af5a71decc45d50b712d/4.0.6/enterprise/Dockerfile)
+-	[`4.0.7`, `4.0`](https://github.com/neo4j/docker-neo4j-publish/blob/6b9071e673dbc67d53005777070ff6b015f666c0/4.0.7/community/Dockerfile)
+-	[`4.0.7-enterprise`, `4.0-enterprise`](https://github.com/neo4j/docker-neo4j-publish/blob/6b9071e673dbc67d53005777070ff6b015f666c0/4.0.7/enterprise/Dockerfile)
+-	[`4.0.6`](https://github.com/neo4j/docker-neo4j-publish/blob/07dcb3dd43df67337f74af5a71decc45d50b712d/4.0.6/community/Dockerfile)
+-	[`4.0.6-enterprise`](https://github.com/neo4j/docker-neo4j-publish/blob/07dcb3dd43df67337f74af5a71decc45d50b712d/4.0.6/enterprise/Dockerfile)
 -	[`4.0.5`](https://github.com/neo4j/docker-neo4j-publish/blob/b47f15c39f28e28e120adff7a00773e0a61c0efe/4.0.5/community/Dockerfile)
 -	[`4.0.5`](https://github.com/neo4j/docker-neo4j-publish/blob/b47f15c39f28e28e120adff7a00773e0a61c0efe/4.0.5/community/Dockerfile)
 -	[`4.0.5-enterprise`](https://github.com/neo4j/docker-neo4j-publish/blob/b47f15c39f28e28e120adff7a00773e0a61c0efe/4.0.5/enterprise/Dockerfile)
 -	[`4.0.5-enterprise`](https://github.com/neo4j/docker-neo4j-publish/blob/b47f15c39f28e28e120adff7a00773e0a61c0efe/4.0.5/enterprise/Dockerfile)
 -	[`4.0.4`](https://github.com/neo4j/docker-neo4j-publish/blob/d5e5e4b1999611ecfa8ec59166acf1ddb703b21c/4.0.4/community/Dockerfile)
 -	[`4.0.4`](https://github.com/neo4j/docker-neo4j-publish/blob/d5e5e4b1999611ecfa8ec59166acf1ddb703b21c/4.0.4/community/Dockerfile)

+ 9 - 9
node/README.md

@@ -39,15 +39,15 @@ WARNING:
 -	[`12.18.2-alpine3.10`, `12.18-alpine3.10`, `12-alpine3.10`, `erbium-alpine3.10`, `lts-alpine3.10`](https://github.com/nodejs/docker-node/blob/1f26041ed1cdbe7df00004006c4105e6b960fc3e/12/alpine3.10/Dockerfile)
 -	[`12.18.2-alpine3.10`, `12.18-alpine3.10`, `12-alpine3.10`, `erbium-alpine3.10`, `lts-alpine3.10`](https://github.com/nodejs/docker-node/blob/1f26041ed1cdbe7df00004006c4105e6b960fc3e/12/alpine3.10/Dockerfile)
 -	[`12.18.2-alpine3.11`, `12.18-alpine3.11`, `12-alpine3.11`, `erbium-alpine3.11`, `lts-alpine3.11`, `12.18.2-alpine`, `12.18-alpine`, `12-alpine`, `erbium-alpine`, `lts-alpine`](https://github.com/nodejs/docker-node/blob/1f26041ed1cdbe7df00004006c4105e6b960fc3e/12/alpine3.11/Dockerfile)
 -	[`12.18.2-alpine3.11`, `12.18-alpine3.11`, `12-alpine3.11`, `erbium-alpine3.11`, `lts-alpine3.11`, `12.18.2-alpine`, `12.18-alpine`, `12-alpine`, `erbium-alpine`, `lts-alpine`](https://github.com/nodejs/docker-node/blob/1f26041ed1cdbe7df00004006c4105e6b960fc3e/12/alpine3.11/Dockerfile)
 -	[`12.18.2-alpine3.12`, `12.18-alpine3.12`, `12-alpine3.12`, `erbium-alpine3.12`, `lts-alpine3.12`](https://github.com/nodejs/docker-node/blob/1f26041ed1cdbe7df00004006c4105e6b960fc3e/12/alpine3.12/Dockerfile)
 -	[`12.18.2-alpine3.12`, `12.18-alpine3.12`, `12-alpine3.12`, `erbium-alpine3.12`, `lts-alpine3.12`](https://github.com/nodejs/docker-node/blob/1f26041ed1cdbe7df00004006c4105e6b960fc3e/12/alpine3.12/Dockerfile)
--	[`10.21.0-jessie`, `10.21-jessie`, `10-jessie`, `dubnium-jessie`](https://github.com/nodejs/docker-node/blob/cc23289cffb36d96cffdc2055122858a1c0614a3/10/jessie/Dockerfile)
--	[`10.21.0-jessie-slim`, `10.21-jessie-slim`, `10-jessie-slim`, `dubnium-jessie-slim`](https://github.com/nodejs/docker-node/blob/cc23289cffb36d96cffdc2055122858a1c0614a3/10/jessie-slim/Dockerfile)
--	[`10.21.0-stretch`, `10.21-stretch`, `10-stretch`, `dubnium-stretch`, `10.21.0`, `10.21`, `10`, `dubnium`](https://github.com/nodejs/docker-node/blob/cc23289cffb36d96cffdc2055122858a1c0614a3/10/stretch/Dockerfile)
--	[`10.21.0-stretch-slim`, `10.21-stretch-slim`, `10-stretch-slim`, `dubnium-stretch-slim`, `10.21.0-slim`, `10.21-slim`, `10-slim`, `dubnium-slim`](https://github.com/nodejs/docker-node/blob/cc23289cffb36d96cffdc2055122858a1c0614a3/10/stretch-slim/Dockerfile)
--	[`10.21.0-buster`, `10.21-buster`, `10-buster`, `dubnium-buster`](https://github.com/nodejs/docker-node/blob/cc23289cffb36d96cffdc2055122858a1c0614a3/10/buster/Dockerfile)
--	[`10.21.0-buster-slim`, `10.21-buster-slim`, `10-buster-slim`, `dubnium-buster-slim`](https://github.com/nodejs/docker-node/blob/cc23289cffb36d96cffdc2055122858a1c0614a3/10/buster-slim/Dockerfile)
--	[`10.21.0-alpine3.9`, `10.21-alpine3.9`, `10-alpine3.9`, `dubnium-alpine3.9`](https://github.com/nodejs/docker-node/blob/cc23289cffb36d96cffdc2055122858a1c0614a3/10/alpine3.9/Dockerfile)
--	[`10.21.0-alpine3.10`, `10.21-alpine3.10`, `10-alpine3.10`, `dubnium-alpine3.10`](https://github.com/nodejs/docker-node/blob/cc23289cffb36d96cffdc2055122858a1c0614a3/10/alpine3.10/Dockerfile)
--	[`10.21.0-alpine3.11`, `10.21-alpine3.11`, `10-alpine3.11`, `dubnium-alpine3.11`, `10.21.0-alpine`, `10.21-alpine`, `10-alpine`, `dubnium-alpine`](https://github.com/nodejs/docker-node/blob/cc23289cffb36d96cffdc2055122858a1c0614a3/10/alpine3.11/Dockerfile)
+-	[`10.22.0-jessie`, `10.22-jessie`, `10-jessie`, `dubnium-jessie`](https://github.com/nodejs/docker-node/blob/744e358d7ddee039618e304f98b9f979152ecced/10/jessie/Dockerfile)
+-	[`10.22.0-jessie-slim`, `10.22-jessie-slim`, `10-jessie-slim`, `dubnium-jessie-slim`](https://github.com/nodejs/docker-node/blob/744e358d7ddee039618e304f98b9f979152ecced/10/jessie-slim/Dockerfile)
+-	[`10.22.0-stretch`, `10.22-stretch`, `10-stretch`, `dubnium-stretch`, `10.22.0`, `10.22`, `10`, `dubnium`](https://github.com/nodejs/docker-node/blob/744e358d7ddee039618e304f98b9f979152ecced/10/stretch/Dockerfile)
+-	[`10.22.0-stretch-slim`, `10.22-stretch-slim`, `10-stretch-slim`, `dubnium-stretch-slim`, `10.22.0-slim`, `10.22-slim`, `10-slim`, `dubnium-slim`](https://github.com/nodejs/docker-node/blob/744e358d7ddee039618e304f98b9f979152ecced/10/stretch-slim/Dockerfile)
+-	[`10.22.0-buster`, `10.22-buster`, `10-buster`, `dubnium-buster`](https://github.com/nodejs/docker-node/blob/744e358d7ddee039618e304f98b9f979152ecced/10/buster/Dockerfile)
+-	[`10.22.0-buster-slim`, `10.22-buster-slim`, `10-buster-slim`, `dubnium-buster-slim`](https://github.com/nodejs/docker-node/blob/744e358d7ddee039618e304f98b9f979152ecced/10/buster-slim/Dockerfile)
+-	[`10.22.0-alpine3.9`, `10.22-alpine3.9`, `10-alpine3.9`, `dubnium-alpine3.9`](https://github.com/nodejs/docker-node/blob/744e358d7ddee039618e304f98b9f979152ecced/10/alpine3.9/Dockerfile)
+-	[`10.22.0-alpine3.10`, `10.22-alpine3.10`, `10-alpine3.10`, `dubnium-alpine3.10`](https://github.com/nodejs/docker-node/blob/744e358d7ddee039618e304f98b9f979152ecced/10/alpine3.10/Dockerfile)
+-	[`10.22.0-alpine3.11`, `10.22-alpine3.11`, `10-alpine3.11`, `dubnium-alpine3.11`, `10.22.0-alpine`, `10.22-alpine`, `10-alpine`, `dubnium-alpine`](https://github.com/nodejs/docker-node/blob/744e358d7ddee039618e304f98b9f979152ecced/10/alpine3.11/Dockerfile)
 
 
 # Quick reference (cont.)
 # Quick reference (cont.)
 
 

+ 10 - 9
openjdk/README.md

@@ -31,13 +31,14 @@ WARNING:
 -	[`16-ea-6-jdk-oraclelinux7`, `16-ea-6-oraclelinux7`, `16-ea-jdk-oraclelinux7`, `16-ea-oraclelinux7`, `16-jdk-oraclelinux7`, `16-oraclelinux7`, `16-ea-6-jdk-oracle`, `16-ea-6-oracle`, `16-ea-jdk-oracle`, `16-ea-oracle`, `16-jdk-oracle`, `16-oracle`](https://github.com/docker-library/openjdk/blob/f28e00f31f9b3e60a60d70a138af3528a89f9f40/16/jdk/oracle/Dockerfile)
 -	[`16-ea-6-jdk-oraclelinux7`, `16-ea-6-oraclelinux7`, `16-ea-jdk-oraclelinux7`, `16-ea-oraclelinux7`, `16-jdk-oraclelinux7`, `16-oraclelinux7`, `16-ea-6-jdk-oracle`, `16-ea-6-oracle`, `16-ea-jdk-oracle`, `16-ea-oracle`, `16-jdk-oracle`, `16-oracle`](https://github.com/docker-library/openjdk/blob/f28e00f31f9b3e60a60d70a138af3528a89f9f40/16/jdk/oracle/Dockerfile)
 -	[`16-ea-6-jdk-buster`, `16-ea-6-buster`, `16-ea-jdk-buster`, `16-ea-buster`, `16-jdk-buster`, `16-buster`](https://github.com/docker-library/openjdk/blob/f28e00f31f9b3e60a60d70a138af3528a89f9f40/16/jdk/Dockerfile)
 -	[`16-ea-6-jdk-buster`, `16-ea-6-buster`, `16-ea-jdk-buster`, `16-ea-buster`, `16-jdk-buster`, `16-buster`](https://github.com/docker-library/openjdk/blob/f28e00f31f9b3e60a60d70a138af3528a89f9f40/16/jdk/Dockerfile)
 -	[`16-ea-6-jdk-slim-buster`, `16-ea-6-slim-buster`, `16-ea-jdk-slim-buster`, `16-ea-slim-buster`, `16-jdk-slim-buster`, `16-slim-buster`, `16-ea-6-jdk-slim`, `16-ea-6-slim`, `16-ea-jdk-slim`, `16-ea-slim`, `16-jdk-slim`, `16-slim`](https://github.com/docker-library/openjdk/blob/f28e00f31f9b3e60a60d70a138af3528a89f9f40/16/jdk/slim/Dockerfile)
 -	[`16-ea-6-jdk-slim-buster`, `16-ea-6-slim-buster`, `16-ea-jdk-slim-buster`, `16-ea-slim-buster`, `16-jdk-slim-buster`, `16-slim-buster`, `16-ea-6-jdk-slim`, `16-ea-6-slim`, `16-ea-jdk-slim`, `16-ea-slim`, `16-jdk-slim`, `16-slim`](https://github.com/docker-library/openjdk/blob/f28e00f31f9b3e60a60d70a138af3528a89f9f40/16/jdk/slim/Dockerfile)
+-	[`16-ea-5-jdk-alpine3.12`, `16-ea-5-alpine3.12`, `16-ea-jdk-alpine3.12`, `16-ea-alpine3.12`, `16-jdk-alpine3.12`, `16-alpine3.12`, `16-ea-5-jdk-alpine`, `16-ea-5-alpine`, `16-ea-jdk-alpine`, `16-ea-alpine`, `16-jdk-alpine`, `16-alpine`](https://github.com/docker-library/openjdk/blob/9efa5c2bd28c10d07e70ceac416187a011dd6184/16/jdk/alpine/Dockerfile)
 -	[`16-ea-6-jdk-windowsservercore-1809`, `16-ea-6-windowsservercore-1809`, `16-ea-jdk-windowsservercore-1809`, `16-ea-windowsservercore-1809`, `16-jdk-windowsservercore-1809`, `16-windowsservercore-1809`](https://github.com/docker-library/openjdk/blob/f28e00f31f9b3e60a60d70a138af3528a89f9f40/16/jdk/windows/windowsservercore-1809/Dockerfile)
 -	[`16-ea-6-jdk-windowsservercore-1809`, `16-ea-6-windowsservercore-1809`, `16-ea-jdk-windowsservercore-1809`, `16-ea-windowsservercore-1809`, `16-jdk-windowsservercore-1809`, `16-windowsservercore-1809`](https://github.com/docker-library/openjdk/blob/f28e00f31f9b3e60a60d70a138af3528a89f9f40/16/jdk/windows/windowsservercore-1809/Dockerfile)
 -	[`16-ea-6-jdk-windowsservercore-ltsc2016`, `16-ea-6-windowsservercore-ltsc2016`, `16-ea-jdk-windowsservercore-ltsc2016`, `16-ea-windowsservercore-ltsc2016`, `16-jdk-windowsservercore-ltsc2016`, `16-windowsservercore-ltsc2016`](https://github.com/docker-library/openjdk/blob/f28e00f31f9b3e60a60d70a138af3528a89f9f40/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
 -	[`16-ea-6-jdk-windowsservercore-ltsc2016`, `16-ea-6-windowsservercore-ltsc2016`, `16-ea-jdk-windowsservercore-ltsc2016`, `16-ea-windowsservercore-ltsc2016`, `16-jdk-windowsservercore-ltsc2016`, `16-windowsservercore-ltsc2016`](https://github.com/docker-library/openjdk/blob/f28e00f31f9b3e60a60d70a138af3528a89f9f40/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
 -	[`16-ea-6-jdk-nanoserver-1809`, `16-ea-6-nanoserver-1809`, `16-ea-jdk-nanoserver-1809`, `16-ea-nanoserver-1809`, `16-jdk-nanoserver-1809`, `16-nanoserver-1809`](https://github.com/docker-library/openjdk/blob/f28e00f31f9b3e60a60d70a138af3528a89f9f40/16/jdk/windows/nanoserver-1809/Dockerfile)
 -	[`16-ea-6-jdk-nanoserver-1809`, `16-ea-6-nanoserver-1809`, `16-ea-jdk-nanoserver-1809`, `16-ea-nanoserver-1809`, `16-jdk-nanoserver-1809`, `16-nanoserver-1809`](https://github.com/docker-library/openjdk/blob/f28e00f31f9b3e60a60d70a138af3528a89f9f40/16/jdk/windows/nanoserver-1809/Dockerfile)
 -	[`15-ea-32-jdk-oraclelinux7`, `15-ea-32-oraclelinux7`, `15-ea-jdk-oraclelinux7`, `15-ea-oraclelinux7`, `15-jdk-oraclelinux7`, `15-oraclelinux7`, `15-ea-32-jdk-oracle`, `15-ea-32-oracle`, `15-ea-jdk-oracle`, `15-ea-oracle`, `15-jdk-oracle`, `15-oracle`](https://github.com/docker-library/openjdk/blob/748340041f02cdc9956b7653b6144224a97bf71d/15/jdk/oracle/Dockerfile)
 -	[`15-ea-32-jdk-oraclelinux7`, `15-ea-32-oraclelinux7`, `15-ea-jdk-oraclelinux7`, `15-ea-oraclelinux7`, `15-jdk-oraclelinux7`, `15-oraclelinux7`, `15-ea-32-jdk-oracle`, `15-ea-32-oracle`, `15-ea-jdk-oracle`, `15-ea-oracle`, `15-jdk-oracle`, `15-oracle`](https://github.com/docker-library/openjdk/blob/748340041f02cdc9956b7653b6144224a97bf71d/15/jdk/oracle/Dockerfile)
 -	[`15-ea-32-jdk-buster`, `15-ea-32-buster`, `15-ea-jdk-buster`, `15-ea-buster`, `15-jdk-buster`, `15-buster`](https://github.com/docker-library/openjdk/blob/748340041f02cdc9956b7653b6144224a97bf71d/15/jdk/Dockerfile)
 -	[`15-ea-32-jdk-buster`, `15-ea-32-buster`, `15-ea-jdk-buster`, `15-ea-buster`, `15-jdk-buster`, `15-buster`](https://github.com/docker-library/openjdk/blob/748340041f02cdc9956b7653b6144224a97bf71d/15/jdk/Dockerfile)
 -	[`15-ea-32-jdk-slim-buster`, `15-ea-32-slim-buster`, `15-ea-jdk-slim-buster`, `15-ea-slim-buster`, `15-jdk-slim-buster`, `15-slim-buster`, `15-ea-32-jdk-slim`, `15-ea-32-slim`, `15-ea-jdk-slim`, `15-ea-slim`, `15-jdk-slim`, `15-slim`](https://github.com/docker-library/openjdk/blob/748340041f02cdc9956b7653b6144224a97bf71d/15/jdk/slim/Dockerfile)
 -	[`15-ea-32-jdk-slim-buster`, `15-ea-32-slim-buster`, `15-ea-jdk-slim-buster`, `15-ea-slim-buster`, `15-jdk-slim-buster`, `15-slim-buster`, `15-ea-32-jdk-slim`, `15-ea-32-slim`, `15-ea-jdk-slim`, `15-ea-slim`, `15-jdk-slim`, `15-slim`](https://github.com/docker-library/openjdk/blob/748340041f02cdc9956b7653b6144224a97bf71d/15/jdk/slim/Dockerfile)
--	[`15-ea-10-jdk-alpine3.11`, `15-ea-10-alpine3.11`, `15-ea-jdk-alpine3.11`, `15-ea-alpine3.11`, `15-jdk-alpine3.11`, `15-alpine3.11`, `15-ea-10-jdk-alpine`, `15-ea-10-alpine`, `15-ea-jdk-alpine`, `15-ea-alpine`, `15-jdk-alpine`, `15-alpine`](https://github.com/docker-library/openjdk/blob/ba84c1878998602129f0d7d94d26aae5e04bc872/15/jdk/alpine/Dockerfile)
+-	[`15-ea-31-jdk-alpine3.12`, `15-ea-31-alpine3.12`, `15-ea-jdk-alpine3.12`, `15-ea-alpine3.12`, `15-jdk-alpine3.12`, `15-alpine3.12`, `15-ea-31-jdk-alpine`, `15-ea-31-alpine`, `15-ea-jdk-alpine`, `15-ea-alpine`, `15-jdk-alpine`, `15-alpine`](https://github.com/docker-library/openjdk/blob/9efa5c2bd28c10d07e70ceac416187a011dd6184/15/jdk/alpine/Dockerfile)
 -	[`15-ea-32-jdk-windowsservercore-1809`, `15-ea-32-windowsservercore-1809`, `15-ea-jdk-windowsservercore-1809`, `15-ea-windowsservercore-1809`, `15-jdk-windowsservercore-1809`, `15-windowsservercore-1809`](https://github.com/docker-library/openjdk/blob/748340041f02cdc9956b7653b6144224a97bf71d/15/jdk/windows/windowsservercore-1809/Dockerfile)
 -	[`15-ea-32-jdk-windowsservercore-1809`, `15-ea-32-windowsservercore-1809`, `15-ea-jdk-windowsservercore-1809`, `15-ea-windowsservercore-1809`, `15-jdk-windowsservercore-1809`, `15-windowsservercore-1809`](https://github.com/docker-library/openjdk/blob/748340041f02cdc9956b7653b6144224a97bf71d/15/jdk/windows/windowsservercore-1809/Dockerfile)
 -	[`15-ea-32-jdk-windowsservercore-ltsc2016`, `15-ea-32-windowsservercore-ltsc2016`, `15-ea-jdk-windowsservercore-ltsc2016`, `15-ea-windowsservercore-ltsc2016`, `15-jdk-windowsservercore-ltsc2016`, `15-windowsservercore-ltsc2016`](https://github.com/docker-library/openjdk/blob/748340041f02cdc9956b7653b6144224a97bf71d/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
 -	[`15-ea-32-jdk-windowsservercore-ltsc2016`, `15-ea-32-windowsservercore-ltsc2016`, `15-ea-jdk-windowsservercore-ltsc2016`, `15-ea-windowsservercore-ltsc2016`, `15-jdk-windowsservercore-ltsc2016`, `15-windowsservercore-ltsc2016`](https://github.com/docker-library/openjdk/blob/748340041f02cdc9956b7653b6144224a97bf71d/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
 -	[`15-ea-32-jdk-nanoserver-1809`, `15-ea-32-nanoserver-1809`, `15-ea-jdk-nanoserver-1809`, `15-ea-nanoserver-1809`, `15-jdk-nanoserver-1809`, `15-nanoserver-1809`](https://github.com/docker-library/openjdk/blob/748340041f02cdc9956b7653b6144224a97bf71d/15/jdk/windows/nanoserver-1809/Dockerfile)
 -	[`15-ea-32-jdk-nanoserver-1809`, `15-ea-32-nanoserver-1809`, `15-ea-jdk-nanoserver-1809`, `15-ea-nanoserver-1809`, `15-jdk-nanoserver-1809`, `15-nanoserver-1809`](https://github.com/docker-library/openjdk/blob/748340041f02cdc9956b7653b6144224a97bf71d/15/jdk/windows/nanoserver-1809/Dockerfile)
@@ -230,6 +231,14 @@ Starting with `openjdk:12` the default image as well as the `-oracle` and `-orac
 
 
 The OpenJDK binaries in the default image as well as the `-oracle` and `-oraclelinux7` variants are built by Oracle and are sourced from the [OpenJDK community](https://openjdk.java.net/). These binaries are licensed under the [GPLv2 with the Classpath Exception](https://openjdk.java.net/legal/gplv2+ce.html).
 The OpenJDK binaries in the default image as well as the `-oracle` and `-oraclelinux7` variants are built by Oracle and are sourced from the [OpenJDK community](https://openjdk.java.net/). These binaries are licensed under the [GPLv2 with the Classpath Exception](https://openjdk.java.net/legal/gplv2+ce.html).
 
 
+## `openjdk:<version>-alpine`
+
+This image is based on the popular [Alpine Linux project](https://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general.
+
+This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](https://musl.libc.org) instead of [glibc and friends](https://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images.
+
+To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar).
+
 ## `openjdk:<version>-windowsservercore`
 ## `openjdk:<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 (`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.
@@ -239,14 +248,6 @@ For information about how to get Docker running on Windows, please see the relev
 -	[Windows Server Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_server)
 -	[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 10 Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_10)
 
 
-## `openjdk:<version>-alpine`
-
-This image is based on the popular [Alpine Linux project](https://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general.
-
-This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](https://musl.libc.org) instead of [glibc and friends](https://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images.
-
-To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar).
-
 # License
 # License
 
 
 View [license information](http://openjdk.java.net/legal/gplv2+ce.html) for the software contained in this image.
 View [license information](http://openjdk.java.net/legal/gplv2+ce.html) for the software contained in this image.

+ 1 - 1
percona/README.md

@@ -24,7 +24,7 @@ WARNING:
 
 
 # Supported tags and respective `Dockerfile` links
 # Supported tags and respective `Dockerfile` links
 
 
--	[`8.0.19-10-centos`, `8.0-centos`, `8-centos`, `8.0.19-10`, `8.0`, `8`, `ps-8.0.19-10`, `ps-8.0`, `ps-8`](https://github.com/percona/percona-docker/blob/c5a71b2b629df714f6dbe25974d754209a3f3bb4/percona-server.80/Dockerfile)
+-	[`8.0.20-11-centos`, `8.0-centos`, `8-centos`, `8.0.20-11`, `8.0`, `8`, `ps-8.0.20-11`, `ps-8.0`, `ps-8`](https://github.com/percona/percona-docker/blob/65855912b9946093cee42f987336440972405391/percona-server.80/Dockerfile)
 -	[`5.7.30-centos`, `5.7-centos`, `5-centos`, `centos`, `5.7.30`, `5.7`, `5`, `ps-5.7.30`, `ps-5.7`, `ps-5`, `latest`](https://github.com/percona/percona-docker/blob/722aecd7714aa6c2fa3e50ccaef1aef45b1ca5c1/percona-server.57/Dockerfile-dockerhub)
 -	[`5.7.30-centos`, `5.7-centos`, `5-centos`, `centos`, `5.7.30`, `5.7`, `5`, `ps-5.7.30`, `ps-5.7`, `ps-5`, `latest`](https://github.com/percona/percona-docker/blob/722aecd7714aa6c2fa3e50ccaef1aef45b1ca5c1/percona-server.57/Dockerfile-dockerhub)
 -	[`5.6.48-centos`, `5.6-centos`, `5.6.48`, `5.6`, `ps-5.6.47`, `ps-5.6`](https://github.com/percona/percona-docker/blob/97f0dd85b9f99da75ea1b74727634ce15c1b5ea0/percona-server.56/Dockerfile-dockerhub)
 -	[`5.6.48-centos`, `5.6-centos`, `5.6.48`, `5.6`, `ps-5.6.47`, `ps-5.6`](https://github.com/percona/percona-docker/blob/97f0dd85b9f99da75ea1b74727634ce15c1b5ea0/percona-server.56/Dockerfile-dockerhub)
 -	[`psmdb-4.2.8`, `psmdb-4.2`](https://github.com/percona/percona-docker/blob/b513dd76f769339c52a5722b12a7a92847c624d5/percona-server-mongodb.42/Dockerfile)
 -	[`psmdb-4.2.8`, `psmdb-4.2`](https://github.com/percona/percona-docker/blob/b513dd76f769339c52a5722b12a7a92847c624d5/percona-server-mongodb.42/Dockerfile)

+ 1 - 1
photon/README.md

@@ -24,7 +24,7 @@ WARNING:
 
 
 # Supported tags and respective `Dockerfile` links
 # Supported tags and respective `Dockerfile` links
 
 
--	[`3.0`, `3.0-20200717`, `latest`](https://github.com/vmware/photon-docker-image/blob/a5980c7982d6f32e8b9ece8035084ae355423172/docker/Dockerfile)
+-	[`3.0`, `3.0-20200721`, `latest`](https://github.com/vmware/photon-docker-image/blob/146a981da0bc85a664e6958cd04b352ecc29989e/docker/Dockerfile)
 -	[`1.0`, `1.0-20200717`](https://github.com/vmware/photon-docker-image/blob/3c36e13019d1de691c5f9254d761fa597c2a54bc/docker/Dockerfile)
 -	[`1.0`, `1.0-20200717`](https://github.com/vmware/photon-docker-image/blob/3c36e13019d1de691c5f9254d761fa597c2a54bc/docker/Dockerfile)
 -	[`2.0`, `2.0-20200710`](https://github.com/vmware/photon-docker-image/blob/0b553b26b89b374d8184e63db204a170e762c5ba/docker/Dockerfile)
 -	[`2.0`, `2.0-20200710`](https://github.com/vmware/photon-docker-image/blob/0b553b26b89b374d8184e63db204a170e762c5ba/docker/Dockerfile)
 
 

+ 3 - 3
redis/README.md

@@ -24,11 +24,11 @@ WARNING:
 
 
 # Supported tags and respective `Dockerfile` links
 # Supported tags and respective `Dockerfile` links
 
 
--	[`6.0.5`, `6.0`, `6`, `latest`, `6.0.5-buster`, `6.0-buster`, `6-buster`, `buster`](https://github.com/docker-library/redis/blob/3a0b4f1d370e4efd30a0db32b0e0cf878f3133d3/6.0/Dockerfile)
--	[`6.0.5-alpine`, `6.0-alpine`, `6-alpine`, `alpine`, `6.0.5-alpine3.12`, `6.0-alpine3.12`, `6-alpine3.12`, `alpine3.12`](https://github.com/docker-library/redis/blob/3a0b4f1d370e4efd30a0db32b0e0cf878f3133d3/6.0/alpine/Dockerfile)
+-	[`6.0.6`, `6.0`, `6`, `latest`, `6.0.6-buster`, `6.0-buster`, `6-buster`, `buster`](https://github.com/docker-library/redis/blob/bfd904a808cf68d4b5ecc267bb4d4a1a0ca5f921/6.0/Dockerfile)
+-	[`6.0.6-alpine`, `6.0-alpine`, `6-alpine`, `alpine`, `6.0.6-alpine3.12`, `6.0-alpine3.12`, `6-alpine3.12`, `alpine3.12`](https://github.com/docker-library/redis/blob/bfd904a808cf68d4b5ecc267bb4d4a1a0ca5f921/6.0/alpine/Dockerfile)
 -	[`5.0.9`, `5.0`, `5`, `5.0.9-buster`, `5.0-buster`, `5-buster`](https://github.com/docker-library/redis/blob/d3a0f3d95ac768db44dbcb87ecf88cfc436581d5/5.0/Dockerfile)
 -	[`5.0.9`, `5.0`, `5`, `5.0.9-buster`, `5.0-buster`, `5-buster`](https://github.com/docker-library/redis/blob/d3a0f3d95ac768db44dbcb87ecf88cfc436581d5/5.0/Dockerfile)
 -	[`5.0.9-32bit`, `5.0-32bit`, `5-32bit`, `5.0.9-32bit-buster`, `5.0-32bit-buster`, `5-32bit-buster`](https://github.com/docker-library/redis/blob/d3a0f3d95ac768db44dbcb87ecf88cfc436581d5/5.0/32bit/Dockerfile)
 -	[`5.0.9-32bit`, `5.0-32bit`, `5-32bit`, `5.0.9-32bit-buster`, `5.0-32bit-buster`, `5-32bit-buster`](https://github.com/docker-library/redis/blob/d3a0f3d95ac768db44dbcb87ecf88cfc436581d5/5.0/32bit/Dockerfile)
--	[`5.0.9-alpine`, `5.0-alpine`, `5-alpine`, `5.0.9-alpine3.12`, `5.0-alpine3.12`, `5-alpine3.12`](https://github.com/docker-library/redis/blob/f6496e4885b8b43e375adaf230354d4076858c8a/5.0/alpine/Dockerfile)
+-	[`5.0.9-alpine`, `5.0-alpine`, `5-alpine`, `5.0.9-alpine3.12`, `5.0-alpine3.12`, `5-alpine3.12`](https://github.com/docker-library/redis/blob/bfd904a808cf68d4b5ecc267bb4d4a1a0ca5f921/5.0/alpine/Dockerfile)
 
 
 # Quick reference (cont.)
 # Quick reference (cont.)
 
 

+ 10 - 4
wordpress/README.md

@@ -185,13 +185,19 @@ The `wordpress` images come in many flavors, each designed for a specific use ca
 
 
 This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of.
 This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of.
 
 
-## `wordpress:<version>-alpine`
+## `wordpress:<version>-fpm`
 
 
-This image is based on the popular [Alpine Linux project](https://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general.
+This variant contains PHP-FPM, which is a FastCGI implementation for PHP. See [the PHP-FPM website](https://php-fpm.org/) for more information about PHP-FPM.
 
 
-This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](https://musl.libc.org) instead of [glibc and friends](https://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images.
+In order to use this image variant, some kind of reverse proxy (such as NGINX, Apache, or other tool which speaks the FastCGI protocol) will be required.
 
 
-To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar).
+Some potentially helpful resources:
+
+-	[PHP-FPM.org](https://php-fpm.org/)
+-	[simplified example by @md5](https://gist.github.com/md5/d9206eacb5a0ff5d6be0)
+-	[very detailed article by Pascal Landau](https://www.pascallandau.com/blog/php-php-fpm-and-nginx-on-docker-in-windows-10/)
+-	[Stack Overflow discussion](https://stackoverflow.com/q/29905953/433558)
+-	[Apache httpd Wiki example](https://wiki.apache.org/httpd/PHPFPMWordpress)
 
 
 ## `wordpress:cli`
 ## `wordpress:cli`