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

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>
This commit is contained in:
Sebastiaan van Stijn 2016-09-25 16:26:46 +02:00 committed by Tibor Vass
parent 856a50e733
commit db0cbdff04
2 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/reference/commandline/cli.md
View File

@ -23,17 +23,17 @@ A self-sufficient runtime for containers.
Options: Options:
--config=~/.docker Location of client config files --config string Location of client config files (default "/root/.docker")
-D, --debug Enable debug mode -D, --debug Enable debug mode
-H, --host=[] Daemon socket(s) to connect to --help Print usage
--help Print usage -H, --host value Daemon socket(s) to connect to (default [])
-l, --log-level=info Set the logging level -l, --log-level string Set the logging level (debug, info, warn, error, fatal) (default "info")
--tls Use TLS; implied by --tlsverify --tls Use TLS; implied by --tlsverify
--tlscacert=~/.docker/ca.pem Trust certs signed only by this CA --tlscacert string Trust certs signed only by this CA (default "/root/.docker/ca.pem")
--tlscert=~/.docker/cert.pem Path to TLS certificate file --tlscert string Path to TLS certificate file (default "/root/.docker/cert.pem")
--tlskey=~/.docker/key.pem Path to TLS key file --tlskey string Path to TLS key file (default "/root/.docker/key.pem")
--tlsverify Use TLS and verify the remote --tlsverify Use TLS and verify the remote
-v, --version Print version information and quit -v, --version Print version information and quit
Commands: Commands:
attach Attach to a running container attach Attach to a running container

124
docs/reference/commandline/dockerd.md
View File

@ -19,68 +19,68 @@ A self-sufficient runtime for containers.
Options: Options:
--add-runtime=[] Register an additional OCI compatible runtime --add-runtime value Register an additional OCI compatible runtime (default [])
--api-cors-header Set CORS headers in the remote API --api-cors-header string Set CORS headers in the remote API
--authorization-plugin=[] Authorization plugins to load --authorization-plugin value Authorization plugins to load (default [])
-b, --bridge Attach containers to a network bridge --bip string Specify network bridge IP
--bip Specify network bridge IP -b, --bridge string Attach containers to a network bridge
--cgroup-parent Set parent cgroup for all containers --cgroup-parent string Set parent cgroup for all containers
--cluster-advertise Address or interface name to advertise --cluster-advertise string Address or interface name to advertise
--cluster-store URL of the distributed storage backend --cluster-store string URL of the distributed storage backend
--cluster-store-opt=map[] Set cluster store options --cluster-store-opt value Set cluster store options (default map[])
--config-file=/etc/docker/daemon.json Daemon configuration file --config-file string Daemon configuration file (default "/etc/docker/daemon.json")
--containerd Path to containerd socket --containerd string Path to containerd socket
-D, --debug Enable debug mode -D, --debug Enable debug mode
--default-gateway Container default gateway IPv4 address --default-gateway value Container default gateway IPv4 address
--default-gateway-v6 Container default gateway IPv6 address --default-gateway-v6 value Container default gateway IPv6 address
--default-runtime=runc Default OCI runtime for containers --default-runtime string Default OCI runtime for containers (default "runc")
--default-ulimit=[] Default ulimits for containers --default-ulimit value Default ulimits for containers (default [])
--disable-legacy-registry Disable contacting legacy registries --disable-legacy-registry Disable contacting legacy registries
--dns=[] DNS server to use --dns value DNS server to use (default [])
--dns-opt=[] DNS options to use --dns-opt value DNS options to use (default [])
--dns-search=[] DNS search domains to use --dns-search value DNS search domains to use (default [])
--exec-opt=[] Runtime execution options --exec-opt value Runtime execution options (default [])
--exec-root=/var/run/docker Root directory for execution state files --exec-root string Root directory for execution state files (default "/var/run/docker")
--fixed-cidr IPv4 subnet for fixed IPs --fixed-cidr string IPv4 subnet for fixed IPs
--fixed-cidr-v6 IPv6 subnet for fixed IPs --fixed-cidr-v6 string IPv6 subnet for fixed IPs
-G, --group=docker Group for the unix socket -g, --graph string Root of the Docker runtime (default "/var/lib/docker")
-g, --graph=/var/lib/docker Root of the Docker runtime -G, --group string Group for the unix socket (default "docker")
-H, --host=[] Daemon socket(s) to connect to --help Print usage
--help Print usage -H, --host value Daemon socket(s) to connect to (default [])
--icc=true Enable inter-container communication --icc Enable inter-container communication (default true)
--init Run an init inside containers to forward signals and reap processes --init Run an init in the container to forward signals and reap processes
--init-path Path to the docker-init binary --init-path string Path to the docker-init binary
--insecure-registry=[] Enable insecure registry communication --insecure-registry value Enable insecure registry communication (default [])
--ip=0.0.0.0 Default IP when binding container ports --ip value Default IP when binding container ports (default 0.0.0.0)
--ip-forward=true Enable net.ipv4.ip_forward --ip-forward Enable net.ipv4.ip_forward (default true)
--ip-masq=true Enable IP masquerading --ip-masq Enable IP masquerading (default true)
--iptables=true Enable addition of iptables rules --iptables Enable addition of iptables rules (default true)
--ipv6 Enable IPv6 networking --ipv6 Enable IPv6 networking
-l, --log-level=info Set the logging level --label value Set key=value labels to the daemon (default [])
--label=[] Set key=value labels to the daemon --live-restore Enable live restore of docker when containers are still running
--live-restore Enables keeping containers alive during daemon downtime --log-driver string Default driver for container logs (default "json-file")
--log-driver=json-file Default driver for container logs -l, --log-level string Set the logging level (debug, info, warn, error, fatal) (default "info")
--log-opt=map[] Default log driver options for containers --log-opt value Default log driver options for containers (default map[])
--max-concurrent-downloads=3 Set the max concurrent downloads for each pull --max-concurrent-downloads int Set the max concurrent downloads for each pull (default 3)
--max-concurrent-uploads=5 Set the max concurrent uploads for each push --max-concurrent-uploads int Set the max concurrent uploads for each push (default 5)
--mtu Set the containers network MTU --mtu int Set the containers network MTU
--oom-score-adjust=-500 Set the oom_score_adj for the daemon --oom-score-adjust int Set the oom_score_adj for the daemon (default -500)
-p, --pidfile=/var/run/docker.pid Path to use for daemon PID file -p, --pidfile string Path to use for daemon PID file (default "/var/run/docker.pid")
--raw-logs Full timestamps without ANSI coloring --raw-logs Full timestamps without ANSI coloring
--registry-mirror=[] Preferred Docker registry mirror --registry-mirror value Preferred Docker registry mirror (default [])
-s, --storage-driver Storage driver to use --selinux-enabled Enable selinux support
--selinux-enabled Enable selinux support -s, --storage-driver string Storage driver to use
--storage-opt=[] Storage driver options --storage-opt value Storage driver options (default [])
--swarm-default-advertise-addr Set default address or interface for swarm advertised address --swarm-default-advertise-addr string Set default address or interface for swarm advertised address
--tls Use TLS; implied by --tlsverify --tls Use TLS; implied by --tlsverify
--tlscacert=~/.docker/ca.pem Trust certs signed only by this CA --tlscacert string Trust certs signed only by this CA (default "/root/.docker/ca.pem")
--tlscert=~/.docker/cert.pem Path to TLS certificate file --tlscert string Path to TLS certificate file (default "/root/.docker/cert.pem")
--tlskey=~/.docker/key.pem Path to TLS key file --tlskey string Path to TLS key file (default "/root/.docker/key.pem")
--tlsverify Use TLS and verify the remote --tlsverify Use TLS and verify the remote
--userland-proxy=true Use userland proxy for loopback traffic --userland-proxy Use userland proxy for loopback traffic (default true)
--userland-proxy-path="" Path to the userland proxy binary --userland-proxy-path string Path to the userland proxy binary
--userns-remap User/Group setting for user namespaces --userns-remap string User/Group setting for user namespaces
-v, --version Print version information and quit -v, --version Print version information and quit
``` ```
Options with [] may be specified multiple times. Options with [] may be specified multiple times.