Docker Library Bot 8 gadi atpakaļ
vecāks
revīzija
91120d0053
4 mainītis faili ar 18 papildinājumiem un 34 dzēšanām
  1. 5 5
      erlang/README.md
  2. 11 27
      golang/README.md
  3. 1 1
      hello-world/README.md
  4. 1 1
      hello-world/content.md

+ 5 - 5
erlang/README.md

@@ -16,12 +16,12 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`20.0.2`, `20.0`, `20`, `latest` (*20/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/1a94b7d23c5e7d4b97e0c210db8ff7c26a60e0ac/20/Dockerfile)
--	[`20.0.2-slim`, `20.0-slim`, `20-slim`, `slim` (*20/slim/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/1a94b7d23c5e7d4b97e0c210db8ff7c26a60e0ac/20/slim/Dockerfile)
--	[`20.0.2-alpine`, `20.0-alpine`, `20-alpine`, `alpine` (*20/alpine/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/1a94b7d23c5e7d4b97e0c210db8ff7c26a60e0ac/20/alpine/Dockerfile)
--	[`19.3.6.2`, `19.3.6`, `19.3`, `19` (*19/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/98222f1cd2c0d266f8c3a225fcb719c4e6d053c4/19/Dockerfile)
+-	[`20.0.3`, `20.0`, `20`, `latest` (*20/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/8e68446c17aaf5bd3c6ab204b920cb01f269438f/20/Dockerfile)
+-	[`20.0.3-slim`, `20.0-slim`, `20-slim`, `slim` (*20/slim/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/5a4e3f42bbe4a24bba8ae8812194f416721913ee/20/slim/Dockerfile)
+-	[`20.0.3-alpine`, `20.0-alpine`, `20-alpine`, `alpine` (*20/alpine/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/67e6c5f8776d39ab22e843ad3cbf2bc9555e99e7/20/alpine/Dockerfile)
+-	[`19.3.6.2`, `19.3.6`, `19.3`, `19` (*19/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/8e68446c17aaf5bd3c6ab204b920cb01f269438f/19/Dockerfile)
 -	[`19.3.6.2-slim`, `19.3.6-slim`, `19.3-slim`, `19-slim` (*19/slim/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/98222f1cd2c0d266f8c3a225fcb719c4e6d053c4/19/slim/Dockerfile)
--	[`18.3.4.5`, `18.3.4`, `18.3`, `18` (*18/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/a9e5cdee4909cb1c9c2ea70595f5d32a46da885f/18/Dockerfile)
+-	[`18.3.4.5`, `18.3.4`, `18.3`, `18` (*18/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/8e68446c17aaf5bd3c6ab204b920cb01f269438f/18/Dockerfile)
 -	[`18.3.4.5-slim`, `18.3.4-slim`, `18.3-slim`, `18-slim` (*18/slim/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/1b03fdd83ec769e7962ec0dce01e25613a46dacf/18/slim/Dockerfile)
 -	[`17.5.6.9`, `17.5.6`, `17.5`, `17` (*17/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/ea32d5f6f1735f9f55bee04b112166da96eb9c73/17/Dockerfile)
 -	[`17.5.6.9-slim`, `17.5.6-slim`, `17.5-slim`, `17-slim` (*17/slim/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/ea32d5f6f1735f9f55bee04b112166da96eb9c73/17/slim/Dockerfile)

+ 11 - 27
golang/README.md

@@ -16,25 +16,17 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`1.9rc2-stretch`, `1.9-rc-stretch`, `1.9-stretch`, `rc-stretch`, `1.9rc2`, `1.9-rc`, `1.9`, `rc` (*1.9-rc/stretch/Dockerfile*)](https://github.com/docker-library/golang/blob/cf5669b0a1d3411c32896075bfabebafda12adbf/1.9-rc/stretch/Dockerfile)
--	[`1.9rc2-alpine3.6`, `1.9-rc-alpine3.6`, `1.9-alpine3.6`, `rc-alpine3.6`, `1.9rc2-alpine`, `1.9-rc-alpine`, `1.9-alpine`, `rc-alpine` (*1.9-rc/alpine3.6/Dockerfile*)](https://github.com/docker-library/golang/blob/cf5669b0a1d3411c32896075bfabebafda12adbf/1.9-rc/alpine3.6/Dockerfile)
--	[`1.9rc2-windowsservercore`, `1.9-rc-windowsservercore`, `1.9-windowsservercore`, `rc-windowsservercore` (*1.9-rc/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/golang/blob/cf5669b0a1d3411c32896075bfabebafda12adbf/1.9-rc/windows/windowsservercore/Dockerfile)
--	[`1.9rc2-nanoserver`, `1.9-rc-nanoserver`, `1.9-nanoserver`, `rc-nanoserver` (*1.9-rc/windows/nanoserver/Dockerfile*)](https://github.com/docker-library/golang/blob/cf5669b0a1d3411c32896075bfabebafda12adbf/1.9-rc/windows/nanoserver/Dockerfile)
--	[`1.8.3-stretch`, `1.8-stretch`, `1-stretch`, `stretch` (*1.8/stretch/Dockerfile*)](https://github.com/docker-library/golang/blob/97b2ff201ec59b9a037197d132c64eb937370c64/1.8/stretch/Dockerfile)
--	[`1.8.3-jessie`, `1.8-jessie`, `1-jessie`, `jessie`, `1.8.3`, `1.8`, `1`, `latest` (*1.8/jessie/Dockerfile*)](https://github.com/docker-library/golang/blob/2a15dfff04accfd31c2a45b3bb7423aa86aa2d60/1.8/jessie/Dockerfile)
--	[`1.8.3-alpine3.6`, `1.8-alpine3.6`, `1-alpine3.6`, `alpine3.6` (*1.8/alpine3.6/Dockerfile*)](https://github.com/docker-library/golang/blob/495a742832974d434c6e3356e19c93b0e82543c8/1.8/alpine3.6/Dockerfile)
--	[`1.8.3-alpine3.5`, `1.8-alpine3.5`, `1-alpine3.5`, `alpine3.5`, `1.8.3-alpine`, `1.8-alpine`, `1-alpine`, `alpine` (*1.8/alpine3.5/Dockerfile*)](https://github.com/docker-library/golang/blob/2a15dfff04accfd31c2a45b3bb7423aa86aa2d60/1.8/alpine3.5/Dockerfile)
--	[`1.8.3-onbuild`, `1.8-onbuild`, `1-onbuild`, `onbuild` (*1.8/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/132cd70768e3bc269902e4c7b579203f66dc9f64/1.8/onbuild/Dockerfile)
--	[`1.8.3-windowsservercore`, `1.8-windowsservercore`, `1-windowsservercore`, `windowsservercore` (*1.8/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/golang/blob/64b88dc3e9d83e71eafc000fed1f0d5e289b3e65/1.8/windows/windowsservercore/Dockerfile)
--	[`1.8.3-nanoserver`, `1.8-nanoserver`, `1-nanoserver`, `nanoserver` (*1.8/windows/nanoserver/Dockerfile*)](https://github.com/docker-library/golang/blob/64b88dc3e9d83e71eafc000fed1f0d5e289b3e65/1.8/windows/nanoserver/Dockerfile)
--	[`1.7.6-jessie`, `1.7-jessie`, `1.7.6`, `1.7` (*1.7/jessie/Dockerfile*)](https://github.com/docker-library/golang/blob/2a15dfff04accfd31c2a45b3bb7423aa86aa2d60/1.7/jessie/Dockerfile)
--	[`1.7.6-wheezy`, `1.7-wheezy` (*1.7/wheezy/Dockerfile*)](https://github.com/docker-library/golang/blob/97b2ff201ec59b9a037197d132c64eb937370c64/1.7/wheezy/Dockerfile)
--	[`1.7.6-alpine3.6`, `1.7-alpine3.6` (*1.7/alpine3.6/Dockerfile*)](https://github.com/docker-library/golang/blob/495a742832974d434c6e3356e19c93b0e82543c8/1.7/alpine3.6/Dockerfile)
--	[`1.7.6-alpine3.5`, `1.7-alpine3.5` (*1.7/alpine3.5/Dockerfile*)](https://github.com/docker-library/golang/blob/9e519a8844c25e38fe67547e8f681ada486e473b/1.7/alpine3.5/Dockerfile)
--	[`1.7.6-alpine3.4`, `1.7-alpine3.4`, `1.7.6-alpine`, `1.7-alpine` (*1.7/alpine3.4/Dockerfile*)](https://github.com/docker-library/golang/blob/2a15dfff04accfd31c2a45b3bb7423aa86aa2d60/1.7/alpine3.4/Dockerfile)
--	[`1.7.6-onbuild`, `1.7-onbuild` (*1.7/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/2372c8cafe9cc958bade33ad0b8b54de8869c21f/1.7/onbuild/Dockerfile)
--	[`1.7.6-windowsservercore`, `1.7-windowsservercore` (*1.7/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/golang/blob/9e519a8844c25e38fe67547e8f681ada486e473b/1.7/windows/windowsservercore/Dockerfile)
--	[`1.7.6-nanoserver`, `1.7-nanoserver` (*1.7/windows/nanoserver/Dockerfile*)](https://github.com/docker-library/golang/blob/9e519a8844c25e38fe67547e8f681ada486e473b/1.7/windows/nanoserver/Dockerfile)
+-	[`1.9.0-stretch`, `1.9-stretch`, `1-stretch`, `stretch`, `1.9.0`, `1.9`, `1`, `latest` (*1.9/stretch/Dockerfile*)](https://github.com/docker-library/golang/blob/f34c645c8402bd8f6b70f530545ad7845dfefbcc/1.9/stretch/Dockerfile)
+-	[`1.9.0-alpine3.6`, `1.9-alpine3.6`, `1-alpine3.6`, `alpine3.6`, `1.9.0-alpine`, `1.9-alpine`, `1-alpine`, `alpine` (*1.9/alpine3.6/Dockerfile*)](https://github.com/docker-library/golang/blob/f34c645c8402bd8f6b70f530545ad7845dfefbcc/1.9/alpine3.6/Dockerfile)
+-	[`1.9.0-windowsservercore`, `1.9-windowsservercore`, `1-windowsservercore`, `windowsservercore` (*1.9/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/golang/blob/f34c645c8402bd8f6b70f530545ad7845dfefbcc/1.9/windows/windowsservercore/Dockerfile)
+-	[`1.9.0-nanoserver`, `1.9-nanoserver`, `1-nanoserver`, `nanoserver` (*1.9/windows/nanoserver/Dockerfile*)](https://github.com/docker-library/golang/blob/f34c645c8402bd8f6b70f530545ad7845dfefbcc/1.9/windows/nanoserver/Dockerfile)
+-	[`1.8.3-stretch`, `1.8-stretch` (*1.8/stretch/Dockerfile*)](https://github.com/docker-library/golang/blob/97b2ff201ec59b9a037197d132c64eb937370c64/1.8/stretch/Dockerfile)
+-	[`1.8.3-jessie`, `1.8-jessie`, `1.8.3`, `1.8` (*1.8/jessie/Dockerfile*)](https://github.com/docker-library/golang/blob/2a15dfff04accfd31c2a45b3bb7423aa86aa2d60/1.8/jessie/Dockerfile)
+-	[`1.8.3-alpine3.6`, `1.8-alpine3.6` (*1.8/alpine3.6/Dockerfile*)](https://github.com/docker-library/golang/blob/495a742832974d434c6e3356e19c93b0e82543c8/1.8/alpine3.6/Dockerfile)
+-	[`1.8.3-alpine3.5`, `1.8-alpine3.5`, `1.8.3-alpine`, `1.8-alpine` (*1.8/alpine3.5/Dockerfile*)](https://github.com/docker-library/golang/blob/2a15dfff04accfd31c2a45b3bb7423aa86aa2d60/1.8/alpine3.5/Dockerfile)
+-	[`1.8.3-onbuild`, `1.8-onbuild` (*1.8/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/132cd70768e3bc269902e4c7b579203f66dc9f64/1.8/onbuild/Dockerfile)
+-	[`1.8.3-windowsservercore`, `1.8-windowsservercore` (*1.8/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/golang/blob/64b88dc3e9d83e71eafc000fed1f0d5e289b3e65/1.8/windows/windowsservercore/Dockerfile)
+-	[`1.8.3-nanoserver`, `1.8-nanoserver` (*1.8/windows/nanoserver/Dockerfile*)](https://github.com/docker-library/golang/blob/64b88dc3e9d83e71eafc000fed1f0d5e289b3e65/1.8/windows/nanoserver/Dockerfile)
 
 # Quick reference
 
@@ -145,14 +137,6 @@ This variant is highly recommended when final image size being as small as possi
 
 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).
 
-## `golang:onbuild`
-
-The `ONBUILD` image variants are deprecated, and their usage is discouraged. For more details, see [docker-library/official-images#2076](https://github.com/docker-library/official-images/issues/2076).
-
-While the `onbuild` variant is really useful for "getting off the ground running" (zero to Dockerized in a short period of time), it's not recommended for long-term usage within a project due to the lack of control over *when* the `ONBUILD` triggers fire (see also [`docker/docker#5714`](https://github.com/docker/docker/issues/5714), [`docker/docker#8240`](https://github.com/docker/docker/issues/8240), [`docker/docker#11917`](https://github.com/docker/docker/issues/11917)).
-
-Once you've got a handle on how your project functions within Docker, you'll probably want to adjust your `Dockerfile` to inherit from a non-`onbuild` variant and copy the commands from the `onbuild` variant `Dockerfile` (moving the `ONBUILD` lines to the end and removing the `ONBUILD` keywords) into your own file so that you have tighter control over them and more transparency for yourself and others looking at your `Dockerfile` as to what it does. This also makes it easier to add additional requirements as time goes on (such as installing more packages before performing the previously-`ONBUILD` steps).
-
 ## `golang: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.

+ 1 - 1
hello-world/README.md

@@ -72,7 +72,7 @@ For more examples and ideas, visit:
 
 $ docker images hello-world
 REPOSITORY   TAG     IMAGE ID      SIZE
-hello-world  latest  1815c82652c0  1.84 kB
+hello-world  latest  1815c82652c0  1.84kB
 ```
 
 ![logo](https://raw.githubusercontent.com/docker-library/docs/01c12653951b2fe592c1f93a13b4e289ada0e3a1/hello-world/logo.png)

+ 1 - 1
hello-world/content.md

@@ -26,7 +26,7 @@ For more examples and ideas, visit:
 
 $ docker images hello-world
 REPOSITORY   TAG     IMAGE ID      SIZE
-hello-world  latest  1815c82652c0  1.84 kB
+hello-world  latest  1815c82652c0  1.84kB
 ```
 
 %%LOGO%%