kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #12209 from ahmetalpbalkan/daemon/cli-help-log-driver-reword

Browse source 
cli: Better wording for daemon --log-driver
This commit is contained in:
Arnaud Porterie 2015-04-10 08:29:29 -07:00
commit 7cec5f50c5
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/config.go
View file

@ -74,7 +74,7 @@ func (config *Config) InstallFlags() {
opts.LabelListVar(&config.Labels, []string{"-label"}, "Set key=value labels to the daemon") opts.LabelListVar(&config.Labels, []string{"-label"}, "Set key=value labels to the daemon")
config.Ulimits = make(map[string]*ulimit.Ulimit) config.Ulimits = make(map[string]*ulimit.Ulimit)
opts.UlimitMapVar(config.Ulimits, []string{"-default-ulimit"}, "Set default ulimits for containers") opts.UlimitMapVar(config.Ulimits, []string{"-default-ulimit"}, "Set default ulimits for containers")
flag.StringVar(&config.LogConfig.Type, []string{"-log-driver"}, "json-file", "Containers logging driver") flag.StringVar(&config.LogConfig.Type, []string{"-log-driver"}, "json-file", "Default driver for container logs")
} }
func getDefaultNetworkMtu() int { func getDefaultNetworkMtu() int {

2
docs/man/docker.1.md
View file

@ -90,7 +90,7 @@ unix://[/path/to/socket] to use.
Set key=value labels to the daemon (displayed in `docker info`) Set key=value labels to the daemon (displayed in `docker info`)
**--log-driver**="*json-file*|*syslog*|*none*" **--log-driver**="*json-file*|*syslog*|*none*"
Container's logging driver. Default is `default`. Default driver for container logs. Default is `json-file`.
**Warning**: `docker logs` command works only for `json-file` logging driver. **Warning**: `docker logs` command works only for `json-file` logging driver.
**--mtu**=VALUE **--mtu**=VALUE

2
docs/sources/reference/commandline/cli.md
View file

@ -134,7 +134,7 @@ expect an integer, and they can only be specified once.
--ipv6=false Enable IPv6 networking --ipv6=false Enable IPv6 networking
-l, --log-level="info" Set the logging level -l, --log-level="info" Set the logging level
--label=[] Set key=value labels to the daemon --label=[] Set key=value labels to the daemon
--log-driver="json-file" Container's logging driver (json-file/none) --log-driver="json-file" Default driver for container logs
--mtu=0 Set the containers network MTU --mtu=0 Set the containers network MTU
-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
--registry-mirror=[] Preferred Docker registry mirror --registry-mirror=[] Preferred Docker registry mirror