浏览代码

Run update.sh

Docker Library Bot 4 年之前
父节点
当前提交
2283a503c7
共有 4 个文件被更改,包括 39 次插入31 次删除
  1. 1 1
      clearlinux/README.md
  2. 10 10
      node/README.md
  3. 12 12
      swift/README.md
  4. 16 8
      yourls/README.md

+ 1 - 1
clearlinux/README.md

@@ -24,7 +24,7 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`latest`, `base`](https://github.com/clearlinux/docker-brew-clearlinux/blob/7d78f84d9c3836078ef732e58bd967cafa8ec2b0/Dockerfile)
+-	[`latest`, `base`](https://github.com/clearlinux/docker-brew-clearlinux/blob/2fc92b5f90a013631fb8537866a6163d90620c55/Dockerfile)
 
 # Quick reference (cont.)
 

+ 10 - 10
node/README.md

@@ -24,16 +24,16 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`16-alpine3.11`, `16.9-alpine3.11`, `16.9.0-alpine3.11`, `alpine3.11`, `current-alpine3.11`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/alpine3.11/Dockerfile)
--	[`16-alpine3.12`, `16.9-alpine3.12`, `16.9.0-alpine3.12`, `alpine3.12`, `current-alpine3.12`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/alpine3.12/Dockerfile)
--	[`16-alpine`, `16-alpine3.13`, `16.9-alpine`, `16.9-alpine3.13`, `16.9.0-alpine`, `16.9.0-alpine3.13`, `alpine`, `alpine3.13`, `current-alpine`, `current-alpine3.13`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/alpine3.13/Dockerfile)
--	[`16-alpine3.14`, `16.9-alpine3.14`, `16.9.0-alpine3.14`, `alpine3.14`, `current-alpine3.14`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/alpine3.14/Dockerfile)
--	[`16-bullseye`, `16.9-bullseye`, `16.9.0-bullseye`, `bullseye`, `current-bullseye`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/bullseye/Dockerfile)
--	[`16-bullseye-slim`, `16.9-bullseye-slim`, `16.9.0-bullseye-slim`, `bullseye-slim`, `current-bullseye-slim`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/bullseye-slim/Dockerfile)
--	[`16`, `16-buster`, `16.9`, `16.9-buster`, `16.9.0`, `16.9.0-buster`, `buster`, `current`, `current-buster`, `latest`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/buster/Dockerfile)
--	[`16-buster-slim`, `16-slim`, `16.9-buster-slim`, `16.9-slim`, `16.9.0-buster-slim`, `16.9.0-slim`, `buster-slim`, `current-buster-slim`, `current-slim`, `slim`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/buster-slim/Dockerfile)
--	[`16-stretch`, `16.9-stretch`, `16.9.0-stretch`, `current-stretch`, `stretch`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/stretch/Dockerfile)
--	[`16-stretch-slim`, `16.9-stretch-slim`, `16.9.0-stretch-slim`, `current-stretch-slim`, `stretch-slim`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/stretch-slim/Dockerfile)
+-	[`16-alpine3.11`, `16.9-alpine3.11`, `16.9.1-alpine3.11`, `alpine3.11`, `current-alpine3.11`](https://github.com/nodejs/docker-node/blob/e7d1cdd4b992b55d35d04371529552110f09e739/16/alpine3.11/Dockerfile)
+-	[`16-alpine3.12`, `16.9-alpine3.12`, `16.9.1-alpine3.12`, `alpine3.12`, `current-alpine3.12`](https://github.com/nodejs/docker-node/blob/e7d1cdd4b992b55d35d04371529552110f09e739/16/alpine3.12/Dockerfile)
+-	[`16-alpine`, `16-alpine3.13`, `16.9-alpine`, `16.9-alpine3.13`, `16.9.1-alpine`, `16.9.1-alpine3.13`, `alpine`, `alpine3.13`, `current-alpine`, `current-alpine3.13`](https://github.com/nodejs/docker-node/blob/e7d1cdd4b992b55d35d04371529552110f09e739/16/alpine3.13/Dockerfile)
+-	[`16-alpine3.14`, `16.9-alpine3.14`, `16.9.1-alpine3.14`, `alpine3.14`, `current-alpine3.14`](https://github.com/nodejs/docker-node/blob/e7d1cdd4b992b55d35d04371529552110f09e739/16/alpine3.14/Dockerfile)
+-	[`16-bullseye`, `16.9-bullseye`, `16.9.1-bullseye`, `bullseye`, `current-bullseye`](https://github.com/nodejs/docker-node/blob/e7d1cdd4b992b55d35d04371529552110f09e739/16/bullseye/Dockerfile)
+-	[`16-bullseye-slim`, `16.9-bullseye-slim`, `16.9.1-bullseye-slim`, `bullseye-slim`, `current-bullseye-slim`](https://github.com/nodejs/docker-node/blob/e7d1cdd4b992b55d35d04371529552110f09e739/16/bullseye-slim/Dockerfile)
+-	[`16`, `16-buster`, `16.9`, `16.9-buster`, `16.9.1`, `16.9.1-buster`, `buster`, `current`, `current-buster`, `latest`](https://github.com/nodejs/docker-node/blob/e7d1cdd4b992b55d35d04371529552110f09e739/16/buster/Dockerfile)
+-	[`16-buster-slim`, `16-slim`, `16.9-buster-slim`, `16.9-slim`, `16.9.1-buster-slim`, `16.9.1-slim`, `buster-slim`, `current-buster-slim`, `current-slim`, `slim`](https://github.com/nodejs/docker-node/blob/e7d1cdd4b992b55d35d04371529552110f09e739/16/buster-slim/Dockerfile)
+-	[`16-stretch`, `16.9-stretch`, `16.9.1-stretch`, `current-stretch`, `stretch`](https://github.com/nodejs/docker-node/blob/e7d1cdd4b992b55d35d04371529552110f09e739/16/stretch/Dockerfile)
+-	[`16-stretch-slim`, `16.9-stretch-slim`, `16.9.1-stretch-slim`, `current-stretch-slim`, `stretch-slim`](https://github.com/nodejs/docker-node/blob/e7d1cdd4b992b55d35d04371529552110f09e739/16/stretch-slim/Dockerfile)
 -	[`14-alpine`, `14-alpine3.11`, `14.17-alpine`, `14.17-alpine3.11`, `14.17.6-alpine`, `14.17.6-alpine3.11`, `fermium-alpine`, `fermium-alpine3.11`, `lts-alpine`, `lts-alpine3.11`](https://github.com/nodejs/docker-node/blob/dc340d0bf2119dee534106ef012e85861cda8b84/14/alpine3.11/Dockerfile)
 -	[`14-alpine3.12`, `14.17-alpine3.12`, `14.17.6-alpine3.12`, `fermium-alpine3.12`, `lts-alpine3.12`](https://github.com/nodejs/docker-node/blob/dc340d0bf2119dee534106ef012e85861cda8b84/14/alpine3.12/Dockerfile)
 -	[`14-alpine3.13`, `14.17-alpine3.13`, `14.17.6-alpine3.13`, `fermium-alpine3.13`, `lts-alpine3.13`](https://github.com/nodejs/docker-node/blob/dc340d0bf2119dee534106ef012e85861cda8b84/14/alpine3.13/Dockerfile)

+ 12 - 12
swift/README.md

@@ -24,18 +24,18 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`5.4.2`, `5.4`, `5.4.2-bionic`, `5.4-bionic`, `bionic`, `latest`](https://github.com/apple/swift-docker/blob/00795177226dc22c1f31a58ec59eefb103e0a9c9/5.4/ubuntu/18.04/Dockerfile)
--	[`5.4.2-xenial`, `5.4-xenial`, `xenial`](https://github.com/apple/swift-docker/blob/00795177226dc22c1f31a58ec59eefb103e0a9c9/5.4/ubuntu/16.04/Dockerfile)
--	[`5.4.2-slim`, `5.4-slim`, `5.4.2-bionic-slim`, `5.4-bionic-slim`, `bionic-slim`, `slim`](https://github.com/apple/swift-docker/blob/00795177226dc22c1f31a58ec59eefb103e0a9c9/5.4/ubuntu/18.04/slim/Dockerfile)
--	[`5.4.2-xenial-slim`, `5.4-xenial-slim`, `xenial-slim`](https://github.com/apple/swift-docker/blob/00795177226dc22c1f31a58ec59eefb103e0a9c9/5.4/ubuntu/16.04/slim/Dockerfile)
--	[`5.4.2-focal-slim`, `5.4-focal-slim`, `focal-slim`](https://github.com/apple/swift-docker/blob/00795177226dc22c1f31a58ec59eefb103e0a9c9/5.4/ubuntu/20.04/slim/Dockerfile)
--	[`5.4.2-focal`, `5.4-focal`, `focal`](https://github.com/apple/swift-docker/blob/00795177226dc22c1f31a58ec59eefb103e0a9c9/5.4/ubuntu/20.04/Dockerfile)
--	[`5.4.2-amazonlinux2`, `5.4-amazonlinux2`, `amazonlinux2`](https://github.com/apple/swift-docker/blob/00795177226dc22c1f31a58ec59eefb103e0a9c9/5.4/amazonlinux/2/Dockerfile)
--	[`5.4.2-amazonlinux2-slim`, `5.4-amazonlinux2-slim`, `amazonlinux2-slim`](https://github.com/apple/swift-docker/blob/00795177226dc22c1f31a58ec59eefb103e0a9c9/5.4/amazonlinux/2/slim/Dockerfile)
--	[`5.4.2-centos8`, `5.4-centos8`, `centos8`](https://github.com/apple/swift-docker/blob/00795177226dc22c1f31a58ec59eefb103e0a9c9/5.4/centos/8/Dockerfile)
--	[`5.4.2-centos8-slim`, `5.4-centos8-slim`, `centos8-slim`](https://github.com/apple/swift-docker/blob/00795177226dc22c1f31a58ec59eefb103e0a9c9/5.4/centos/8/slim/Dockerfile)
--	[`5.4.2-centos7`, `5.4-centos7`, `centos7`](https://github.com/apple/swift-docker/blob/00795177226dc22c1f31a58ec59eefb103e0a9c9/5.4/centos/7/Dockerfile)
--	[`5.4.2-centos7-slim`, `5.4-centos7-slim`, `centos7-slim`](https://github.com/apple/swift-docker/blob/00795177226dc22c1f31a58ec59eefb103e0a9c9/5.4/centos/7/slim/Dockerfile)
+-	[`5.4.3`, `5.4`, `5.4.3-bionic`, `5.4-bionic`, `bionic`, `latest`](https://github.com/apple/swift-docker/blob/a237eebf9da296be70616b32650fe032cee195fd/5.4/ubuntu/18.04/Dockerfile)
+-	[`5.4.3-xenial`, `5.4-xenial`, `xenial`](https://github.com/apple/swift-docker/blob/a237eebf9da296be70616b32650fe032cee195fd/5.4/ubuntu/16.04/Dockerfile)
+-	[`5.4.3-slim`, `5.4-slim`, `5.4.3-bionic-slim`, `5.4-bionic-slim`, `bionic-slim`, `slim`](https://github.com/apple/swift-docker/blob/a237eebf9da296be70616b32650fe032cee195fd/5.4/ubuntu/18.04/slim/Dockerfile)
+-	[`5.4.3-xenial-slim`, `5.4-xenial-slim`, `xenial-slim`](https://github.com/apple/swift-docker/blob/a237eebf9da296be70616b32650fe032cee195fd/5.4/ubuntu/16.04/slim/Dockerfile)
+-	[`5.4.3-focal-slim`, `5.4-focal-slim`, `focal-slim`](https://github.com/apple/swift-docker/blob/a237eebf9da296be70616b32650fe032cee195fd/5.4/ubuntu/20.04/slim/Dockerfile)
+-	[`5.4.3-focal`, `5.4-focal`, `focal`](https://github.com/apple/swift-docker/blob/a237eebf9da296be70616b32650fe032cee195fd/5.4/ubuntu/20.04/Dockerfile)
+-	[`5.4.3-amazonlinux2`, `5.4-amazonlinux2`, `amazonlinux2`](https://github.com/apple/swift-docker/blob/a237eebf9da296be70616b32650fe032cee195fd/5.4/amazonlinux/2/Dockerfile)
+-	[`5.4.3-amazonlinux2-slim`, `5.4-amazonlinux2-slim`, `amazonlinux2-slim`](https://github.com/apple/swift-docker/blob/a237eebf9da296be70616b32650fe032cee195fd/5.4/amazonlinux/2/slim/Dockerfile)
+-	[`5.4.3-centos8`, `5.4-centos8`, `centos8`](https://github.com/apple/swift-docker/blob/a237eebf9da296be70616b32650fe032cee195fd/5.4/centos/8/Dockerfile)
+-	[`5.4.3-centos8-slim`, `5.4-centos8-slim`, `centos8-slim`](https://github.com/apple/swift-docker/blob/a237eebf9da296be70616b32650fe032cee195fd/5.4/centos/8/slim/Dockerfile)
+-	[`5.4.3-centos7`, `5.4-centos7`, `centos7`](https://github.com/apple/swift-docker/blob/a237eebf9da296be70616b32650fe032cee195fd/5.4/centos/7/Dockerfile)
+-	[`5.4.3-centos7-slim`, `5.4-centos7-slim`, `centos7-slim`](https://github.com/apple/swift-docker/blob/a237eebf9da296be70616b32650fe032cee195fd/5.4/centos/7/slim/Dockerfile)
 -	[`5.3.3`, `5.3`, `5.3.3-bionic`, `5.3-bionic`](https://github.com/apple/swift-docker/blob/78fb43bb44c727704436dd05bd4cc586c1e11aca/5.3/ubuntu/18.04/Dockerfile)
 -	[`5.3.3-xenial`, `5.3-xenial`](https://github.com/apple/swift-docker/blob/78fb43bb44c727704436dd05bd4cc586c1e11aca/5.3/ubuntu/16.04/Dockerfile)
 -	[`5.3.3-slim`, `5.3-slim`, `5.3.3-bionic-slim`, `5.3-bionic-slim`](https://github.com/apple/swift-docker/blob/78fb43bb44c727704436dd05bd4cc586c1e11aca/5.3/ubuntu/18.04/slim/Dockerfile)

+ 16 - 8
yourls/README.md

@@ -113,23 +113,23 @@ Example: `YOURLS_USER="example_username"`
 **Required.**  
 YOURLS instance password.
 
-Example: `YOURLS_USER="example_password"`
+Example: `YOURLS_PASS="example_password"`
 
 ### `YOURLS_DB_HOST`, `YOURLS_DB_USER`, `YOURLS_DB_PASS`
 
 **Optional if linked `mysql` container.**
 
-Host, user (defaults to "root") and password for the database.
+Host, user (defaults to `root`) and password for the database.
 
 ### `YOURLS_DB_NAME`
 
 **Optional.**  
-Database name, defaults to "yourls". The database must have been created before installing YOURLS.
+Database name, defaults to `yourls`. The database must have been created before installing YOURLS.
 
 ### `YOURLS_DB_PREFIX`
 
 **Optional.**  
-Database tables prefix, defaults to "yourls_". Only set this when you need to override the default table prefix.
+Database tables prefix, defaults to `yourls_`. Only set this when you need to override the default table prefix.
 
 ## Docker Secrets
 
@@ -191,13 +191,21 @@ The `yourls` 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.
 
-## `yourls:<version>-alpine`
+## `yourls:<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 useful when final image size being as small as possible is your primary concern. 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 software will often run into issues depending on the depth of their libc requirements/assumptions. 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)
+
+**WARNING:** the FastCGI protocol is inherently trusting, and thus *extremely* insecure to expose outside of a private container network -- unless you know *exactly* what you are doing (and are willing to accept the extreme risk), do not use Docker's `--publish` (`-p`) flag with this image variant.
 
 # License