Browse code
Improve --log-level help text
This information was added in
1efc940e6f547760e5e8f4648acb120ff19fdc58,
but removed again in
a271eaeba224652e3a12af0287afbae6f82a9333
to make the help-output fit in a 80-chars
terminal.
This adds the available options again
in the help output, and updates the CLI
reference documentation to match actual
output.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2016/09/25 23:26:46Showing 3 changed files
| ... | ... |
@@ -53,7 +53,7 @@ func (commonOpts *CommonOptions) InstallFlags(flags *pflag.FlagSet) {
|
| 53 | 53 |
} |
| 54 | 54 |
|
| 55 | 55 |
flags.BoolVarP(&commonOpts.Debug, "debug", "D", false, "Enable debug mode") |
| 56 |
- flags.StringVarP(&commonOpts.LogLevel, "log-level", "l", "info", "Set the logging level") |
|
| 56 |
+ flags.StringVarP(&commonOpts.LogLevel, "log-level", "l", "info", "Set the logging level (debug, info, warn, error, fatal)") |
|
| 57 | 57 |
flags.BoolVar(&commonOpts.TLS, "tls", false, "Use TLS; implied by --tlsverify") |
| 58 | 58 |
flags.BoolVar(&commonOpts.TLSVerify, FlagTLSVerify, dockerTLSVerify, "Use TLS and verify the remote") |
| 59 | 59 |
|
| ... | ... |
@@ -23,17 +23,17 @@ A self-sufficient runtime for containers. |
| 23 | 23 |
|
| 24 | 24 |
Options: |
| 25 | 25 |
|
| 26 |
- --config=~/.docker Location of client config files |
|
| 27 |
- -D, --debug Enable debug mode |
|
| 28 |
- -H, --host=[] Daemon socket(s) to connect to |
|
| 29 |
- --help Print usage |
|
| 30 |
- -l, --log-level=info Set the logging level |
|
| 31 |
- --tls Use TLS; implied by --tlsverify |
|
| 32 |
- --tlscacert=~/.docker/ca.pem Trust certs signed only by this CA |
|
| 33 |
- --tlscert=~/.docker/cert.pem Path to TLS certificate file |
|
| 34 |
- --tlskey=~/.docker/key.pem Path to TLS key file |
|
| 35 |
- --tlsverify Use TLS and verify the remote |
|
| 36 |
- -v, --version Print version information and quit |
|
| 26 |
+ --config string Location of client config files (default "/root/.docker") |
|
| 27 |
+ -D, --debug Enable debug mode |
|
| 28 |
+ --help Print usage |
|
| 29 |
+ -H, --host value Daemon socket(s) to connect to (default []) |
|
| 30 |
+ -l, --log-level string Set the logging level (debug, info, warn, error, fatal) (default "info") |
|
| 31 |
+ --tls Use TLS; implied by --tlsverify |
|
| 32 |
+ --tlscacert string Trust certs signed only by this CA (default "/root/.docker/ca.pem") |
|
| 33 |
+ --tlscert string Path to TLS certificate file (default "/root/.docker/cert.pem") |
|
| 34 |
+ --tlskey string Path to TLS key file (default "/root/.docker/key.pem") |
|
| 35 |
+ --tlsverify Use TLS and verify the remote |
|
| 36 |
+ -v, --version Print version information and quit |
|
| 37 | 37 |
|
| 38 | 38 |
Commands: |
| 39 | 39 |
attach Attach to a running container |
| ... | ... |
@@ -19,68 +19,68 @@ A self-sufficient runtime for containers. |
| 19 | 19 |
|
| 20 | 20 |
Options: |
| 21 | 21 |
|
| 22 |
- --add-runtime=[] Register an additional OCI compatible runtime |
|
| 23 |
- --api-cors-header Set CORS headers in the remote API |
|
| 24 |
- --authorization-plugin=[] Authorization plugins to load |
|
| 25 |
- -b, --bridge Attach containers to a network bridge |
|
| 26 |
- --bip Specify network bridge IP |
|
| 27 |
- --cgroup-parent Set parent cgroup for all containers |
|
| 28 |
- --cluster-advertise Address or interface name to advertise |
|
| 29 |
- --cluster-store URL of the distributed storage backend |
|
| 30 |
- --cluster-store-opt=map[] Set cluster store options |
|
| 31 |
- --config-file=/etc/docker/daemon.json Daemon configuration file |
|
| 32 |
- --containerd Path to containerd socket |
|
| 33 |
- -D, --debug Enable debug mode |
|
| 34 |
- --default-gateway Container default gateway IPv4 address |
|
| 35 |
- --default-gateway-v6 Container default gateway IPv6 address |
|
| 36 |
- --default-runtime=runc Default OCI runtime for containers |
|
| 37 |
- --default-ulimit=[] Default ulimits for containers |
|
| 38 |
- --disable-legacy-registry Disable contacting legacy registries |
|
| 39 |
- --dns=[] DNS server to use |
|
| 40 |
- --dns-opt=[] DNS options to use |
|
| 41 |
- --dns-search=[] DNS search domains to use |
|
| 42 |
- --exec-opt=[] Runtime execution options |
|
| 43 |
- --exec-root=/var/run/docker Root directory for execution state files |
|
| 44 |
- --fixed-cidr IPv4 subnet for fixed IPs |
|
| 45 |
- --fixed-cidr-v6 IPv6 subnet for fixed IPs |
|
| 46 |
- -G, --group=docker Group for the unix socket |
|
| 47 |
- -g, --graph=/var/lib/docker Root of the Docker runtime |
|
| 48 |
- -H, --host=[] Daemon socket(s) to connect to |
|
| 49 |
- --help Print usage |
|
| 50 |
- --icc=true Enable inter-container communication |
|
| 51 |
- --init Run an init inside containers to forward signals and reap processes |
|
| 52 |
- --init-path Path to the docker-init binary |
|
| 53 |
- --insecure-registry=[] Enable insecure registry communication |
|
| 54 |
- --ip=0.0.0.0 Default IP when binding container ports |
|
| 55 |
- --ip-forward=true Enable net.ipv4.ip_forward |
|
| 56 |
- --ip-masq=true Enable IP masquerading |
|
| 57 |
- --iptables=true Enable addition of iptables rules |
|
| 58 |
- --ipv6 Enable IPv6 networking |
|
| 59 |
- -l, --log-level=info Set the logging level |
|
| 60 |
- --label=[] Set key=value labels to the daemon |
|
| 61 |
- --live-restore Enables keeping containers alive during daemon downtime |
|
| 62 |
- --log-driver=json-file Default driver for container logs |
|
| 63 |
- --log-opt=map[] Default log driver options for containers |
|
| 64 |
- --max-concurrent-downloads=3 Set the max concurrent downloads for each pull |
|
| 65 |
- --max-concurrent-uploads=5 Set the max concurrent uploads for each push |
|
| 66 |
- --mtu Set the containers network MTU |
|
| 67 |
- --oom-score-adjust=-500 Set the oom_score_adj for the daemon |
|
| 68 |
- -p, --pidfile=/var/run/docker.pid Path to use for daemon PID file |
|
| 69 |
- --raw-logs Full timestamps without ANSI coloring |
|
| 70 |
- --registry-mirror=[] Preferred Docker registry mirror |
|
| 71 |
- -s, --storage-driver Storage driver to use |
|
| 72 |
- --selinux-enabled Enable selinux support |
|
| 73 |
- --storage-opt=[] Storage driver options |
|
| 74 |
- --swarm-default-advertise-addr Set default address or interface for swarm advertised address |
|
| 75 |
- --tls Use TLS; implied by --tlsverify |
|
| 76 |
- --tlscacert=~/.docker/ca.pem Trust certs signed only by this CA |
|
| 77 |
- --tlscert=~/.docker/cert.pem Path to TLS certificate file |
|
| 78 |
- --tlskey=~/.docker/key.pem Path to TLS key file |
|
| 79 |
- --tlsverify Use TLS and verify the remote |
|
| 80 |
- --userland-proxy=true Use userland proxy for loopback traffic |
|
| 81 |
- --userland-proxy-path="" Path to the userland proxy binary |
|
| 82 |
- --userns-remap User/Group setting for user namespaces |
|
| 83 |
- -v, --version Print version information and quit |
|
| 22 |
+ --add-runtime value Register an additional OCI compatible runtime (default []) |
|
| 23 |
+ --api-cors-header string Set CORS headers in the remote API |
|
| 24 |
+ --authorization-plugin value Authorization plugins to load (default []) |
|
| 25 |
+ --bip string Specify network bridge IP |
|
| 26 |
+ -b, --bridge string Attach containers to a network bridge |
|
| 27 |
+ --cgroup-parent string Set parent cgroup for all containers |
|
| 28 |
+ --cluster-advertise string Address or interface name to advertise |
|
| 29 |
+ --cluster-store string URL of the distributed storage backend |
|
| 30 |
+ --cluster-store-opt value Set cluster store options (default map[]) |
|
| 31 |
+ --config-file string Daemon configuration file (default "/etc/docker/daemon.json") |
|
| 32 |
+ --containerd string Path to containerd socket |
|
| 33 |
+ -D, --debug Enable debug mode |
|
| 34 |
+ --default-gateway value Container default gateway IPv4 address |
|
| 35 |
+ --default-gateway-v6 value Container default gateway IPv6 address |
|
| 36 |
+ --default-runtime string Default OCI runtime for containers (default "runc") |
|
| 37 |
+ --default-ulimit value Default ulimits for containers (default []) |
|
| 38 |
+ --disable-legacy-registry Disable contacting legacy registries |
|
| 39 |
+ --dns value DNS server to use (default []) |
|
| 40 |
+ --dns-opt value DNS options to use (default []) |
|
| 41 |
+ --dns-search value DNS search domains to use (default []) |
|
| 42 |
+ --exec-opt value Runtime execution options (default []) |
|
| 43 |
+ --exec-root string Root directory for execution state files (default "/var/run/docker") |
|
| 44 |
+ --fixed-cidr string IPv4 subnet for fixed IPs |
|
| 45 |
+ --fixed-cidr-v6 string IPv6 subnet for fixed IPs |
|
| 46 |
+ -g, --graph string Root of the Docker runtime (default "/var/lib/docker") |
|
| 47 |
+ -G, --group string Group for the unix socket (default "docker") |
|
| 48 |
+ --help Print usage |
|
| 49 |
+ -H, --host value Daemon socket(s) to connect to (default []) |
|
| 50 |
+ --icc Enable inter-container communication (default true) |
|
| 51 |
+ --init Run an init in the container to forward signals and reap processes |
|
| 52 |
+ --init-path string Path to the docker-init binary |
|
| 53 |
+ --insecure-registry value Enable insecure registry communication (default []) |
|
| 54 |
+ --ip value Default IP when binding container ports (default 0.0.0.0) |
|
| 55 |
+ --ip-forward Enable net.ipv4.ip_forward (default true) |
|
| 56 |
+ --ip-masq Enable IP masquerading (default true) |
|
| 57 |
+ --iptables Enable addition of iptables rules (default true) |
|
| 58 |
+ --ipv6 Enable IPv6 networking |
|
| 59 |
+ --label value Set key=value labels to the daemon (default []) |
|
| 60 |
+ --live-restore Enable live restore of docker when containers are still running |
|
| 61 |
+ --log-driver string Default driver for container logs (default "json-file") |
|
| 62 |
+ -l, --log-level string Set the logging level (debug, info, warn, error, fatal) (default "info") |
|
| 63 |
+ --log-opt value Default log driver options for containers (default map[]) |
|
| 64 |
+ --max-concurrent-downloads int Set the max concurrent downloads for each pull (default 3) |
|
| 65 |
+ --max-concurrent-uploads int Set the max concurrent uploads for each push (default 5) |
|
| 66 |
+ --mtu int Set the containers network MTU |
|
| 67 |
+ --oom-score-adjust int Set the oom_score_adj for the daemon (default -500) |
|
| 68 |
+ -p, --pidfile string Path to use for daemon PID file (default "/var/run/docker.pid") |
|
| 69 |
+ --raw-logs Full timestamps without ANSI coloring |
|
| 70 |
+ --registry-mirror value Preferred Docker registry mirror (default []) |
|
| 71 |
+ --selinux-enabled Enable selinux support |
|
| 72 |
+ -s, --storage-driver string Storage driver to use |
|
| 73 |
+ --storage-opt value Storage driver options (default []) |
|
| 74 |
+ --swarm-default-advertise-addr string Set default address or interface for swarm advertised address |
|
| 75 |
+ --tls Use TLS; implied by --tlsverify |
|
| 76 |
+ --tlscacert string Trust certs signed only by this CA (default "/root/.docker/ca.pem") |
|
| 77 |
+ --tlscert string Path to TLS certificate file (default "/root/.docker/cert.pem") |
|
| 78 |
+ --tlskey string Path to TLS key file (default "/root/.docker/key.pem") |
|
| 79 |
+ --tlsverify Use TLS and verify the remote |
|
| 80 |
+ --userland-proxy Use userland proxy for loopback traffic (default true) |
|
| 81 |
+ --userland-proxy-path string Path to the userland proxy binary |
|
| 82 |
+ --userns-remap string User/Group setting for user namespaces |
|
| 83 |
+ -v, --version Print version information and quit |
|
| 84 | 84 |
``` |
| 85 | 85 |
|
| 86 | 86 |
Options with [] may be specified multiple times. |