diff --git a/docs/misc/deprecated.md b/docs/misc/deprecated.md index 4b63716a1e..d1a48d320c 100644 --- a/docs/misc/deprecated.md +++ b/docs/misc/deprecated.md @@ -100,3 +100,9 @@ docker was automatically creating the `/host/path` if it didn't already exist. This auto-creation of the host path is deprecated and docker will error out if the path does not exist. + +### Interacting with V1 registries + +Version 1.9 adds a flag (`--no-legacy-registry=false`) which prevents the docker daemon from `pull`, `push`, and `login` operations against v1 registries. Though disabled by default, this signals the intent to deprecate the v1 protocol. + + diff --git a/docs/reference/commandline/daemon.md b/docs/reference/commandline/daemon.md index 1fbfdcde7d..c60c8f2cdd 100644 --- a/docs/reference/commandline/daemon.md +++ b/docs/reference/commandline/daemon.md @@ -47,6 +47,7 @@ weight=1 --log-driver="json-file" Default driver for container logs --log-opt=[] Log driver specific options --mtu=0 Set the containers network MTU + --no-legacy-registry=false Do not contact legacy registries -p, --pidfile="/var/run/docker.pid" Path to use for daemon PID file --registry-mirror=[] Preferred Docker registry mirror -s, --storage-driver="" Storage driver to use @@ -455,6 +456,10 @@ because its use creates security vulnerabilities it should ONLY be enabled for testing purposes. For increased security, users should add their CA to their system's list of trusted CAs instead of enabling `--insecure-registry`. +## Legacy Registries + +Enabling `--no-legacy-registry` forces a docker daemon to only interact with registries which support the V2 protocol. Specifically, the daemon will not attempt `push`, `pull` and `login` to v1 registries. The exception to this is `search` which can still be performed on v1 registries. + ## Running a Docker daemon behind a HTTPS_PROXY When running inside a LAN that uses a `HTTPS` proxy, the Docker Hub diff --git a/man/docker-daemon.8.md b/man/docker-daemon.8.md index 63c43c36a4..e8edc1add4 100644 --- a/man/docker-daemon.8.md +++ b/man/docker-daemon.8.md @@ -39,6 +39,7 @@ docker-daemon - Enable daemon mode [**--log-driver**[=*json-file*]] [**--log-opt**[=*map[]*]] [**--mtu**[=*0*]] +[**--no-legacy-registry**[=*false*]] [**-p**|**--pidfile**[=*/var/run/docker.pid*]] [**--registry-mirror**[=*[]*]] [**-s**|**--storage-driver**[=*STORAGE-DRIVER*]] @@ -166,6 +167,9 @@ unix://[/path/to/socket] to use. **--mtu**=VALUE Set the containers network mtu. Default is `0`. +**--no-legacy-registry**=*true*|*false* + Do not contact legacy registries + **-p**, **--pidfile**="" Path to use for daemon PID file. Default is `/var/run/docker.pid`