Merge pull request #4773 from thaJeztah/daemon_fix_env_table

docs: dockerd: fix markdown table, and rephrase environment-variables intro
This commit is contained in:
Sebastiaan van Stijn 2024-01-11 15:31:56 +01:00 committed by GitHub
commit c825db8a69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions

View File

@ -130,8 +130,11 @@ to [the `daemon.json` file](#daemon-configuration-file).
### Environment variables ### Environment variables
For easy reference, the following list of environment variables are supported The following list of environment variables are supported by the `dockerd` daemon.
by the `dockerd` command line: 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 | | Variable | Description |
|:--------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| |:--------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@ -142,7 +145,7 @@ by the `dockerd` command line:
| `DOCKER_TMPDIR` | Location for temporary files created by the daemon. | | `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. | | `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. | | `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. | | `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 ## Examples