Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow disabling of colored Docker logs via daemon flag. 

Signed-off-by: Vincent Woo <me@vincentwoo.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
This commit is contained in:
Vincent Woo 2015-12-13 02:10:41 -08:00 committed by Tibor Vass
parent e8ba17c379
commit 1a10df30ce
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/completion/bash/docker
View File

@ -748,6 +748,7 @@ _docker_daemon() {
--ip-masq=false --ip-masq=false
--iptables=false --iptables=false
--ipv6 --ipv6
--raw-logs
--selinux-enabled --selinux-enabled
--userland-proxy=false --userland-proxy=false
" "

1
contrib/completion/zsh/_docker
View File

@ -666,6 +666,7 @@ __docker_subcommand() {
"($help)*--log-opt=[Log driver specific options]:log driver options:__docker_log_options" \ "($help)*--log-opt=[Log driver specific options]:log driver options:__docker_log_options" \
"($help)--mtu=[Set the containers network MTU]:mtu:(0 576 1420 1500 9000)" \ "($help)--mtu=[Set the containers network MTU]:mtu:(0 576 1420 1500 9000)" \
"($help -p --pidfile)"{-p=,--pidfile=}"[Path to use for daemon PID file]:PID file:_files" \ "($help -p --pidfile)"{-p=,--pidfile=}"[Path to use for daemon PID file]:PID file:_files" \
"($help)--raw-logs[Full timestamps without ANSI coloring]" \
"($help)*--registry-mirror=[Preferred Docker registry mirror]:registry mirror: " \ "($help)*--registry-mirror=[Preferred Docker registry mirror]:registry mirror: " \
"($help -s --storage-driver)"{-s=,--storage-driver=}"[Storage driver to use]:driver:(aufs devicemapper btrfs zfs overlay)" \ "($help -s --storage-driver)"{-s=,--storage-driver=}"[Storage driver to use]:driver:(aufs devicemapper btrfs zfs overlay)" \
"($help)--selinux-enabled[Enable selinux support]" \ "($help)--selinux-enabled[Enable selinux support]" \

28
docs/reference/commandline/daemon.md
View File

@ -54,6 +54,7 @@ weight = -1
--mtu=0 Set the containers network MTU --mtu=0 Set the containers network MTU
--disable-legacy-registry Do not contact legacy registries --disable-legacy-registry Do not contact legacy registries
-p, --pidfile="/var/run/docker.pid" Path to use for daemon PID file -p, --pidfile="/var/run/docker.pid" Path to use for daemon PID file
--raw-logs Full timestamps without ANSI coloring
--registry-mirror=[] Preferred Docker registry mirror --registry-mirror=[] Preferred Docker registry mirror
-s, --storage-driver="" Storage driver to use -s, --storage-driver="" Storage driver to use
--selinux-enabled Enable selinux support --selinux-enabled Enable selinux support
@ -860,19 +861,20 @@ This is a full example of the allowed configuration options in the file:
"group": "", "group": "",
"cgroup-parent": "", "cgroup-parent": "",
"default-ulimits": {}, "default-ulimits": {},
"ipv6": false, "ipv6": false,
"iptables": false, "iptables": false,
"ip-forward": false, "ip-forward": false,
"ip-mask": false, "ip-mask": false,
"userland-proxy": false, "userland-proxy": false,
"ip": "0.0.0.0", "ip": "0.0.0.0",
"bridge": "", "bridge": "",
"bip": "", "bip": "",
"fixed-cidr": "", "fixed-cidr": "",
"fixed-cidr-v6": "", "fixed-cidr-v6": "",
"default-gateway": "", "default-gateway": "",
"default-gateway-v6": "", "default-gateway-v6": "",
"icc": false "icc": false,
"raw-logs": false
} }
``` ```

6
man/docker-daemon.8.md
View File

@ -44,6 +44,7 @@ docker-daemon - Enable daemon mode
[**--log-opt**[=*map[]*]] [**--log-opt**[=*map[]*]]
[**--mtu**[=*0*]] [**--mtu**[=*0*]]
[**-p**|**--pidfile**[=*/var/run/docker.pid*]] [**-p**|**--pidfile**[=*/var/run/docker.pid*]]
[**--raw-logs**]
[**--registry-mirror**[=*[]*]] [**--registry-mirror**[=*[]*]]
[**-s**|**--storage-driver**[=*STORAGE-DRIVER*]] [**-s**|**--storage-driver**[=*STORAGE-DRIVER*]]
[**--selinux-enabled**] [**--selinux-enabled**]
@ -197,6 +198,11 @@ unix://[/path/to/socket] to use.
**-p**, **--pidfile**="" **-p**, **--pidfile**=""
Path to use for daemon PID file. Default is `/var/run/docker.pid` Path to use for daemon PID file. Default is `/var/run/docker.pid`
**--raw-logs**
Output daemon logs in full timestamp format without ANSI coloring. If this flag is not set,
the daemon outputs condensed, colorized logs if a terminal is detected, or full ("raw")
output otherwise.
**--registry-mirror**=*<scheme>://<host>* **--registry-mirror**=*<scheme>://<host>*
Prepend a registry mirror to be used for image pulls. May be specified multiple times. Prepend a registry mirror to be used for image pulls. May be specified multiple times.