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:
parent
245d6e83a9
commit
87a450a37f
7 changed files with 30 additions and 15 deletions
|
@ -748,6 +748,7 @@ _docker_daemon() {
|
|||
--ip-masq=false
|
||||
--iptables=false
|
||||
--ipv6
|
||||
--raw-logs
|
||||
--selinux-enabled
|
||||
--userland-proxy=false
|
||||
"
|
||||
|
|
|
@ -666,6 +666,7 @@ __docker_subcommand() {
|
|||
"($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 -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 -s --storage-driver)"{-s=,--storage-driver=}"[Storage driver to use]:driver:(aufs devicemapper btrfs zfs overlay)" \
|
||||
"($help)--selinux-enabled[Enable selinux support]" \
|
||||
|
|
|
@ -39,7 +39,7 @@ script
|
|||
if [ -f /etc/default/$UPSTART_JOB ]; then
|
||||
. /etc/default/$UPSTART_JOB
|
||||
fi
|
||||
exec "$DOCKER" daemon $DOCKER_OPTS
|
||||
exec "$DOCKER" daemon $DOCKER_OPTS --raw-logs
|
||||
end script
|
||||
|
||||
# Don't emit "started" event until docker.sock is ready.
|
||||
|
|
|
@ -57,6 +57,7 @@ type CommonConfig struct {
|
|||
Labels []string `json:"labels,omitempty"`
|
||||
Mtu int `json:"mtu,omitempty"`
|
||||
Pidfile string `json:"pidfile,omitempty"`
|
||||
RawLogs bool `json:"raw-logs,omitempty"`
|
||||
Root string `json:"graph,omitempty"`
|
||||
TrustKeyPath string `json:"-"`
|
||||
|
||||
|
@ -104,6 +105,7 @@ func (config *Config) InstallCommonFlags(cmd *flag.FlagSet, usageFn func(string)
|
|||
cmd.BoolVar(&config.AutoRestart, []string{"#r", "#-restart"}, true, usageFn("--restart on the daemon has been deprecated in favor of --restart policies on docker run"))
|
||||
cmd.StringVar(&config.GraphDriver, []string{"s", "-storage-driver"}, "", usageFn("Storage driver to use"))
|
||||
cmd.IntVar(&config.Mtu, []string{"#mtu", "-mtu"}, 0, usageFn("Set the containers network MTU"))
|
||||
cmd.BoolVar(&config.RawLogs, []string{"-raw-logs"}, false, usageFn("Full timestamps without ANSI coloring"))
|
||||
// FIXME: why the inconsistency between "hosts" and "sockets"?
|
||||
cmd.Var(opts.NewListOptsRef(&config.DNS, opts.ValidateIPAddress), []string{"#dns", "-dns"}, usageFn("DNS server to use"))
|
||||
cmd.Var(opts.NewNamedListOptsRef("dns-opts", &config.DNSOptions, nil), []string{"-dns-opt"}, usageFn("DNS options to use"))
|
||||
|
|
|
@ -168,7 +168,10 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error {
|
|||
logrus.Warn("Running experimental build")
|
||||
}
|
||||
|
||||
logrus.SetFormatter(&logrus.TextFormatter{TimestampFormat: jsonlog.RFC3339NanoFixed})
|
||||
logrus.SetFormatter(&logrus.TextFormatter{
|
||||
TimestampFormat: jsonlog.RFC3339NanoFixed,
|
||||
DisableColors: cli.Config.RawLogs,
|
||||
})
|
||||
|
||||
if err := setDefaultUmask(); err != nil {
|
||||
logrus.Fatalf("Failed to set umask: %v", err)
|
||||
|
|
|
@ -54,6 +54,7 @@ weight = -1
|
|||
--mtu=0 Set the containers network MTU
|
||||
--disable-legacy-registry Do not contact legacy registries
|
||||
-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
|
||||
-s, --storage-driver="" Storage driver to use
|
||||
--selinux-enabled Enable selinux support
|
||||
|
@ -860,19 +861,20 @@ This is a full example of the allowed configuration options in the file:
|
|||
"group": "",
|
||||
"cgroup-parent": "",
|
||||
"default-ulimits": {},
|
||||
"ipv6": false,
|
||||
"iptables": false,
|
||||
"ip-forward": false,
|
||||
"ip-mask": false,
|
||||
"userland-proxy": false,
|
||||
"ip": "0.0.0.0",
|
||||
"bridge": "",
|
||||
"bip": "",
|
||||
"fixed-cidr": "",
|
||||
"fixed-cidr-v6": "",
|
||||
"default-gateway": "",
|
||||
"default-gateway-v6": "",
|
||||
"icc": false
|
||||
"ipv6": false,
|
||||
"iptables": false,
|
||||
"ip-forward": false,
|
||||
"ip-mask": false,
|
||||
"userland-proxy": false,
|
||||
"ip": "0.0.0.0",
|
||||
"bridge": "",
|
||||
"bip": "",
|
||||
"fixed-cidr": "",
|
||||
"fixed-cidr-v6": "",
|
||||
"default-gateway": "",
|
||||
"default-gateway-v6": "",
|
||||
"icc": false,
|
||||
"raw-logs": false
|
||||
}
|
||||
```
|
||||
|
||||
|
|
|
@ -44,6 +44,7 @@ docker-daemon - Enable daemon mode
|
|||
[**--log-opt**[=*map[]*]]
|
||||
[**--mtu**[=*0*]]
|
||||
[**-p**|**--pidfile**[=*/var/run/docker.pid*]]
|
||||
[**--raw-logs**]
|
||||
[**--registry-mirror**[=*[]*]]
|
||||
[**-s**|**--storage-driver**[=*STORAGE-DRIVER*]]
|
||||
[**--selinux-enabled**]
|
||||
|
@ -197,6 +198,11 @@ unix://[/path/to/socket] to use.
|
|||
**-p**, **--pidfile**=""
|
||||
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>*
|
||||
Prepend a registry mirror to be used for image pulls. May be specified multiple times.
|
||||
|
||||
|
|
Loading…
Reference in a new issue