From 5f02c0a5aba758e2dd775b05f92c06d245851e6e Mon Sep 17 00:00:00 2001 From: Tomasz Kopczynski Date: Tue, 16 Feb 2016 23:45:48 +0100 Subject: [PATCH] Add insecure registries to docker info Signed-off-by: Tomasz Kopczynski --- docs/reference/commandline/info.md | 3 +++ man/docker-info.1.md | 3 +++ 2 files changed, 6 insertions(+) diff --git a/docs/reference/commandline/info.md b/docs/reference/commandline/info.md index 06f7848d5a..25a5dd20de 100644 --- a/docs/reference/commandline/info.md +++ b/docs/reference/commandline/info.md @@ -62,6 +62,9 @@ For example: Registry: [https://index.docker.io/v1/] Labels: storage=ssd + Insecure registries: + myinsecurehost:5000 + 127.0.0.0/8 The global `-D` option tells all `docker` commands to output debug information. diff --git a/man/docker-info.1.md b/man/docker-info.1.md index 1ebcd1a419..d0103df2b1 100644 --- a/man/docker-info.1.md +++ b/man/docker-info.1.md @@ -59,6 +59,9 @@ Here is a sample output: Debug mode (server): false Username: xyz Registry: https://index.docker.io/v1/ + Insecure registries: + myinsecurehost:5000 + 127.0.0.0/8 # HISTORY April 2014, Originally compiled by William Henry (whenry at redhat dot com)