From 4e7c875e3b35e09aa4f2ef872d5463356989f609 Mon Sep 17 00:00:00 2001 From: dito Date: Tue, 16 Jun 2020 10:17:58 +0900 Subject: [PATCH 1/3] Fix broken link Signed-off-by: Daisuke Ito (cherry picked from commit 0f7260d1c7698993f34f89a0f989842c0208a1bd) Signed-off-by: Sebastiaan van Stijn --- docs/reference/builder.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/builder.md b/docs/reference/builder.md index 7ee8b10be8..b8dca249a2 100644 --- a/docs/reference/builder.md +++ b/docs/reference/builder.md @@ -608,7 +608,7 @@ FROM [--platform=] [@] [AS ] ``` The `FROM` instruction initializes a new build stage and sets the -[*Base Image*](../../glossary/#base-image) for subsequent instructions. As such, a +[*Base Image*](https://docs.docker.com/glossary/#base_image) for subsequent instructions. As such, a valid `Dockerfile` must start with a `FROM` instruction. The image can be any valid image – it is especially easy to start by **pulling an image** from the [*Public Repositories*](https://docs.docker.com/engine/tutorials/dockerrepos/). From 8b8ec04cd6adaedf178ad269a4dc0e6ab647d3e9 Mon Sep 17 00:00:00 2001 From: Sargun Dhillon Date: Fri, 12 Jan 2018 09:30:31 -0800 Subject: [PATCH 2/3] Split up environment variable documentation between cli and dockerd This creates a new section of environment variables in the CLI docs which documents environment variables that can both be used on dockerd and on docker cli. In addition, it moves some of the environment variable documentation from the docker cli documentation to the dockerd documentation, as these environment variables are dockerd-specific. Signed-off-by: Sargun Dhillon Signed-off-by: Sebastiaan van Stijn (cherry picked from commit ad301e74102fc028d6b4137038528ab6b03bb6b1) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/cli.md | 16 ++++++++-------- docs/reference/commandline/dockerd.md | 11 +++++++++++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/docs/reference/commandline/cli.md b/docs/reference/commandline/cli.md index 8f9f691915..35047da148 100644 --- a/docs/reference/commandline/cli.md +++ b/docs/reference/commandline/cli.md @@ -61,16 +61,9 @@ by the `docker` command line: * `DOCKER_API_VERSION` The API version to use (e.g. `1.19`) * `DOCKER_CONFIG` The location of your client configuration files. -* `DOCKER_CERT_PATH` The location of your authentication keys. * `DOCKER_CLI_EXPERIMENTAL` Enable experimental features for the cli (e.g. `enabled` or `disabled`) -* `DOCKER_DRIVER` The graph driver to use. * `DOCKER_HOST` Daemon socket to connect to. -* `DOCKER_NOWARN_KERNEL_VERSION` Prevent warnings that your Linux kernel is - unsuitable for Docker. -* `DOCKER_RAMDISK` If set this will disable 'pivot_root'. * `DOCKER_STACK_ORCHESTRATOR` Configure the default orchestrator to use when using `docker stack` management commands. -* `DOCKER_TLS` When set Docker uses TLS. -* `DOCKER_TLS_VERIFY` When set Docker uses TLS and verifies the remote. * `DOCKER_CONTENT_TRUST` When set Docker uses notary to sign and verify images. Equates to `--disable-content-trust=false` for build, create, pull, push, run. * `DOCKER_CONTENT_TRUST_SERVER` The URL of the Notary server to use. This defaults @@ -78,10 +71,17 @@ by the `docker` command line: * `DOCKER_HIDE_LEGACY_COMMANDS` When set, Docker hides "legacy" top-level commands (such as `docker rm`, and `docker pull`) in `docker help` output, and only `Management commands` per object-type (e.g., `docker container`) are printed. This may become the default in a future release, at which point this environment-variable is removed. -* `DOCKER_TMPDIR` Location for temporary Docker files. * `DOCKER_CONTEXT` Specify the context to use (overrides DOCKER_HOST env var and default context set with "docker context use") * `DOCKER_DEFAULT_PLATFORM` Specify the default platform for the commands that take the `--platform` flag. +#### Shared Environment variables + +These environment variables can be used both with the `docker` command line and +`dockerd` command line: + +* `DOCKER_CERT_PATH` The location of your authentication keys. +* `DOCKER_TLS_VERIFY` When set Docker uses TLS and verifies the remote. + Because Docker is developed using Go, you can also use any environment variables used by the Go runtime. In particular, you may find these useful: diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md index 562bd48984..ac856e989f 100644 --- a/docs/reference/commandline/dockerd.md +++ b/docs/reference/commandline/dockerd.md @@ -117,6 +117,17 @@ the `daemon.json` file. > Enable experimental features by starting `dockerd` with the `--experimental` > flag or adding `"experimental": true` to the `daemon.json` file. +### Environment variables + +For easy reference, the following list of environment variables are supported +by the `dockerd` command line: + +* `DOCKER_DRIVER` The graph driver to use. +* `DOCKER_NOWARN_KERNEL_VERSION` Prevent warnings that your Linux kernel is + unsuitable for Docker. +* `DOCKER_RAMDISK` If set this will disable 'pivot_root'. +* `DOCKER_TMPDIR` Location for temporary Docker files. + ## Examples ### Daemon socket option From 521a636a86ccb8af19e534235160e641ef04c26c Mon Sep 17 00:00:00 2001 From: Sargun Dhillon Date: Fri, 12 Jan 2018 09:32:45 -0800 Subject: [PATCH 3/3] Add MOBY_DISABLE_PIGZ to dockerd environment variable docs This reflects a Moby change to add documentation around disabling a new feature -- to use pgzip to decompress layers, rather than the built-in go gzip. Signed-off-by: Sargun Dhillon Signed-off-by: Sebastiaan van Stijn (cherry picked from commit e1148e2c70f9f94d3dd1c7e41e20570bb4f6c723) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/dockerd.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md index ac856e989f..481e509d78 100644 --- a/docs/reference/commandline/dockerd.md +++ b/docs/reference/commandline/dockerd.md @@ -127,6 +127,8 @@ by the `dockerd` command line: unsuitable for Docker. * `DOCKER_RAMDISK` If set this will disable 'pivot_root'. * `DOCKER_TMPDIR` Location for temporary Docker files. +* `MOBY_DISABLE_PIGZ` Do not use [`unpigz`](https://linux.die.net/man/1/pigz) to + decompress layers in parallel when pulling images, even if it is installed. ## Examples