From 4d2b4e7fba398263a5a88c6fbf47cc2f9c54647a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 11 Jan 2024 13:54:39 +0100 Subject: [PATCH 1/2] docs: dockerd: fix stray column-separateor in env-var table Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/dockerd.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md index 313332bde3..f465530902 100644 --- a/docs/reference/commandline/dockerd.md +++ b/docs/reference/commandline/dockerd.md @@ -142,7 +142,7 @@ by the `dockerd` command line: | `DOCKER_TMPDIR` | Location for temporary files created by the daemon. | | `HTTP_PROXY` | Proxy URL for HTTP requests unless overridden by NoProxy. See the [Go specification](https://pkg.go.dev/golang.org/x/net/http/httpproxy#Config) for details. | | `HTTPS_PROXY` | Proxy URL for HTTPS requests unless overridden by NoProxy. See the [Go specification](https://pkg.go.dev/golang.org/x/net/http/httpproxy#Config) for details. | -| `MOBY_DISABLE_PIGZ` | Disables the use of [`unpigz`](https://linux.die.net/man/1/pigz) to decompress layers in parallel when pulling images, even if it is installed. | | +| `MOBY_DISABLE_PIGZ` | Disables the use of [`unpigz`](https://linux.die.net/man/1/pigz) to decompress layers in parallel when pulling images, even if it is installed. | | `NO_PROXY` | Comma-separated values specifying hosts that should be excluded from proxying. See the [Go specification](https://pkg.go.dev/golang.org/x/net/http/httpproxy#Config) for details. | ## Examples From 79992184e0d4cdaa08f6920b649769c77cdd0558 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 11 Jan 2024 13:55:10 +0100 Subject: [PATCH 2/2] docs: dockerd: rephrase environment-variables intro Slightly rephrase the intro (remove "easy reference"), and cross-reference the corresponding section on the docker CLI page. Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/dockerd.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md index f465530902..996e0253a0 100644 --- a/docs/reference/commandline/dockerd.md +++ b/docs/reference/commandline/dockerd.md @@ -130,8 +130,11 @@ to [the `daemon.json` file](#daemon-configuration-file). ### Environment variables -For easy reference, the following list of environment variables are supported -by the `dockerd` command line: +The following list of environment variables are supported by the `dockerd` daemon. +Some of these environment variables are supported both by the Docker Daemon and +the `docker` CLI. Refer to [Environment variables](cli.md#environment-variables) +in the CLI section to learn about environment variables supported by the +`docker` CLI. | Variable | Description | |:--------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|