Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 051459c

Browse files
Merge pull request #2591 from thaJeztah/19.03_backport_docs_fixes2
[19.03 backport] assorted docs fixes Upstream-commit: ab45dc8fdc8379cbc3471228e4f16f69bccfe605 Component: cli
2 parents 2fbdc02 + c505281 commit 051459c

3 files changed

Lines changed: 22 additions & 9 deletions

File tree

components/cli/docs/reference/builder.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ FROM [--platform=<platform>] <image>[@<digest>] [AS <name>]
608608
```
609609

610610
The `FROM` instruction initializes a new build stage and sets the
611-
[*Base Image*](../../glossary/#base-image) for subsequent instructions. As such, a
611+
[*Base Image*](https://docs.docker.com/glossary/#base_image) for subsequent instructions. As such, a
612612
valid `Dockerfile` must start with a `FROM` instruction. The image can be
613613
any valid image – it is especially easy to start by **pulling an image** from
614614
the [*Public Repositories*](https://docs.docker.com/engine/tutorials/dockerrepos/).

components/cli/docs/reference/commandline/cli.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,27 +61,27 @@ by the `docker` command line:
6161

6262
* `DOCKER_API_VERSION` The API version to use (e.g. `1.19`)
6363
* `DOCKER_CONFIG` The location of your client configuration files.
64-
* `DOCKER_CERT_PATH` The location of your authentication keys.
6564
* `DOCKER_CLI_EXPERIMENTAL` Enable experimental features for the cli (e.g. `enabled` or `disabled`)
66-
* `DOCKER_DRIVER` The graph driver to use.
6765
* `DOCKER_HOST` Daemon socket to connect to.
68-
* `DOCKER_NOWARN_KERNEL_VERSION` Prevent warnings that your Linux kernel is
69-
unsuitable for Docker.
70-
* `DOCKER_RAMDISK` If set this will disable 'pivot_root'.
7166
* `DOCKER_STACK_ORCHESTRATOR` Configure the default orchestrator to use when using `docker stack` management commands.
72-
* `DOCKER_TLS` When set Docker uses TLS.
73-
* `DOCKER_TLS_VERIFY` When set Docker uses TLS and verifies the remote.
7467
* `DOCKER_CONTENT_TRUST` When set Docker uses notary to sign and verify images.
7568
Equates to `--disable-content-trust=false` for build, create, pull, push, run.
7669
* `DOCKER_CONTENT_TRUST_SERVER` The URL of the Notary server to use. This defaults
7770
to the same URL as the registry.
7871
* `DOCKER_HIDE_LEGACY_COMMANDS` When set, Docker hides "legacy" top-level commands (such as `docker rm`, and
7972
`docker pull`) in `docker help` output, and only `Management commands` per object-type (e.g., `docker container`) are
8073
printed. This may become the default in a future release, at which point this environment-variable is removed.
81-
* `DOCKER_TMPDIR` Location for temporary Docker files.
8274
* `DOCKER_CONTEXT` Specify the context to use (overrides DOCKER_HOST env var and default context set with "docker context use")
8375
* `DOCKER_DEFAULT_PLATFORM` Specify the default platform for the commands that take the `--platform` flag.
8476

77+
#### Shared Environment variables
78+
79+
These environment variables can be used both with the `docker` command line and
80+
`dockerd` command line:
81+
82+
* `DOCKER_CERT_PATH` The location of your authentication keys.
83+
* `DOCKER_TLS_VERIFY` When set Docker uses TLS and verifies the remote.
84+
8585
Because Docker is developed using Go, you can also use any environment
8686
variables used by the Go runtime. In particular, you may find these useful:
8787

components/cli/docs/reference/commandline/dockerd.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,19 @@ the `daemon.json` file.
117117
> Enable experimental features by starting `dockerd` with the `--experimental`
118118
> flag or adding `"experimental": true` to the `daemon.json` file.
119119
120+
### Environment variables
121+
122+
For easy reference, the following list of environment variables are supported
123+
by the `dockerd` command line:
124+
125+
* `DOCKER_DRIVER` The graph driver to use.
126+
* `DOCKER_NOWARN_KERNEL_VERSION` Prevent warnings that your Linux kernel is
127+
unsuitable for Docker.
128+
* `DOCKER_RAMDISK` If set this will disable 'pivot_root'.
129+
* `DOCKER_TMPDIR` Location for temporary Docker files.
130+
* `MOBY_DISABLE_PIGZ` Do not use [`unpigz`](https://linux.die.net/man/1/pigz) to
131+
decompress layers in parallel when pulling images, even if it is installed.
132+
120133
## Examples
121134

122135
### Daemon socket option

0 commit comments

Comments
 (0)