Commit Graph

249 Commits

Author SHA1 Message Date
f6a50ae86c add note to docs about overlay + btrfs
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: e6d8a17cf5
Component: cli
2017-06-02 00:06:43 +00:00
0463b47ef4 Return docker's root dir in docker -D info
This adds the docker daemon's root directory to docker info when running
in debug mode.  This allows the user to view the root directory where
docker is writing and storing state.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f96a52c955
Component: cli
2017-06-02 00:06:43 +00:00
c792fd44dd fixes as per feedback
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 640fabe8da
Component: cli
2017-06-02 00:06:43 +00:00
84ddb26bc1 Try out a different phrase for --icc
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 87353ddc98
Component: cli
2017-06-02 00:06:43 +00:00
aaed4e0c16 Doc: described storage-driver options in cli reference
Documented --storage-opt=[] option in cli reference page. Content taken
from:

  daemon/graphdriver/devmapper/README.md

Signed-off-by: Michal Minar <miminar@redhat.com>

Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com> (github: SvenDowideit)
Upstream-commit: 716e639748
Component: cli
2017-06-02 00:06:43 +00:00
31e804025e Man: describe --icc option better
Current description is misleading. It make an impression the --icc=false
prevents containers to talk with each other.

Signed-off-by: Michal Minar <miminar@redhat.com>

Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com> (github: SvenDowideit)
Upstream-commit: 0f2e87fcf8
Component: cli
2017-06-02 00:06:42 +00:00
d332fa764a Auto-update documentation from the output of the cli.
I've re-jigged the run man page so that each option's text begins with the
cli's help text for that flag, and then ay subsequent lines in the man page
are carried forward.

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: f79055e610
Component: cli
2017-06-02 00:06:42 +00:00
080c97a25c Rename the overlay storage driver
so that docker is started with `docker -d -s overlay` instead of `docker -d -s overlayfs`

Signed-off-by: Lénaïc Huard <lhuard@amadeus.com>
Upstream-commit: 12a763ba5a
Component: cli
2017-06-02 00:06:42 +00:00
4736be8026 Fix dead link cli.md
Upstream-commit: f7c051492c
Component: cli
2017-06-02 00:06:42 +00:00
90939c9f0c docs: man docker-images: inconsistent naming
Synopsis is mentioning "NAME" while description is describing "REPOSITORY".

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
Upstream-commit: 82436ff167
Component: cli
2017-06-02 00:06:42 +00:00
819c49ea5c Correct inaccuracy in docker pull documentation
Signed-off-by: Alexander Boyd <alex@opengroove.org>
Upstream-commit: ed00fc5e27
Component: cli
2017-06-02 00:06:42 +00:00
efb266cb50 Add an example of how to add your client IP to the container hosts file
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 00a5a3fa8a
Component: cli
2017-06-02 00:06:42 +00:00
61fcd6e040 Explain what the VIRTUAL SIZE means
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 11d4be9719
Component: cli
2017-06-02 00:06:42 +00:00
3c97fbae98 docs nits
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 3b475ff060
Component: cli
2017-06-02 00:06:42 +00:00
4eba96b318 events filtering
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 8434115c69
Component: cli
2017-06-02 00:06:42 +00:00
e486807e94 Allow git@ prefixes for any hosted git service
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 923e1ecbc5
Component: cli
2017-06-02 00:06:41 +00:00
2c34b10f2b Made wording a bit more generic.
Upstream-commit: 536f41a73e
Component: cli
2017-06-02 00:06:41 +00:00
c59a968f67 Fixed typo in documentation.
Upstream-commit: 536361ff18
Component: cli
2017-06-02 00:06:41 +00:00
4f24766563 build: add pull flag to force image pulling
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 494cc3ad71
Component: cli
2017-06-02 00:06:41 +00:00
67b39c281e overlayfs: add --storage-driver doc
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: acb8b1b5f6
Component: cli
2017-06-02 00:06:41 +00:00
451c603811 key=values -> key=value
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: ddef8db902
Component: cli
2017-06-02 00:06:41 +00:00
7c74f2adec add daemon labels
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 1d559f6ade
Component: cli
2017-06-02 00:06:41 +00:00
bd9d6fbc20 If an image has more than one repo name or tag, it'll be listed more than once
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 43cd8c9586
Component: cli
2017-06-02 00:06:41 +00:00
4ddb957d2d Make --tlsverify enable tls regardless of value specified
I also needed to add a mflag.IsSet() function that allows you to check
to see if a certain flag was actually specified on the cmd line.

Per #9221 - also tweaked the docs to fix a typo.

Closes #9221

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: d9382df2b3
Component: cli
2017-06-02 00:06:41 +00:00
f0d8c03c8f tlsverify flag has no dash
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 9af3e1ad09
Component: cli
2017-06-02 00:06:41 +00:00
65c2bcbe2e Hostname -> Name
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 44071eb4ce
Component: cli
2017-06-02 00:06:41 +00:00
0b6b46ba85 add docs
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: d0e9a94ae0
Component: cli
2017-06-02 00:06:41 +00:00
13768dcc5d Corrected description of --sig-proxy
Signal proxy does work only in non-TTY mode (--tty=false). Man pages and
commands should not lie about it.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: fec9e65e60
Component: cli
2017-06-02 00:06:40 +00:00
e97e6e3e85 makes the -s --size option documentation clearer #8950
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ef4fe0e404
Component: cli
2017-06-02 00:06:40 +00:00
300fafc9bd Add --log-level support
Next steps, in another PR, would be:
- make all logging go through the logrus stuff
- I'd like to see if we can remove the env var stuff (like DEBUG) but we'll see

Closes #5198

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: aa2c308471
Component: cli
2017-06-02 00:06:40 +00:00
27f2fd60d8 Fix typo "infortmation" in docs for docker run
Upstream-commit: 7f24369ab5
Component: cli
2017-06-02 00:06:39 +00:00
47e5cb2293 Add some details about the lifecycle of commands started with docker exec
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: e4401e3fe1
Component: cli
2017-06-02 00:06:39 +00:00
93b94d46f6 Adding docker-cli run param to set MAC address
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: ad1a9d8d2f
Component: cli
2017-06-02 00:06:39 +00:00
b0ca1476df adding support for port ranges on --expose
Closes #1834

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 5b9405b388
Component: cli
2017-06-02 00:06:39 +00:00
98446ec813 Fix docker exec command help messages
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 01b86d0d32
Component: cli
2017-06-02 00:06:39 +00:00
a312a1076d add missing 'current filter' to ps
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 39b226dc84
Component: cli
2017-06-02 00:06:39 +00:00
f1eebaa357 Mapping change in code
Signed-off-by: Huayi Zhang <irachex@gmail.com>
Upstream-commit: 166109859e
Component: cli
2017-06-02 00:06:39 +00:00
d89be4ab41 Add docs for --dns-search=.
PR 6720 introduce that use `--dns-search=.` will not set `search` in `/etc/resolv.conf`.

Signed-off-by: Huayi Zhang <irachex@gmail.com>
Upstream-commit: deabfbc88f
Component: cli
2017-06-02 00:06:39 +00:00
0243ab522c Expose # of CPUs and memory available on docker info.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 588d30ecca
Component: cli
2017-06-02 00:06:37 +00:00
5e95091151 Link to run reference from cli doc
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: aedfc62293
Component: cli
2017-06-02 00:06:37 +00:00
26175343ba Docs syntax fix
the flags must come before the container name.
Upstream-commit: ff38494bbe
Component: cli
2017-06-02 00:06:37 +00:00
8f6a45b8f7 Add info on --device flag permissions ':rwm'
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 981a612adf
Component: cli
2017-06-02 00:06:37 +00:00
5d203350cb Rewrite documentation for insecure registries
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	docs/sources/reference/commandline/cli.md
Upstream-commit: d227c88e19
Component: cli
2017-06-02 00:06:37 +00:00
ef8ce68f4e Add the possibility of specifying a subnet for --insecure-registry
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/endpoint.go
Upstream-commit: 5b491e6942
Component: cli
2017-06-02 00:06:36 +00:00
da915828c4 Docs edits for dropping SSLv3 and under + release notes for 1.3.1
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	docs/sources/index.md
Upstream-commit: f58767aced
Component: cli
2017-06-02 00:06:36 +00:00
e49075d737 Do not verify certificate when using --insecure-registry on an HTTPS registry
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/registry.go
	registry/registry_test.go
	registry/service.go
	registry/session.go
Upstream-commit: 8d6cc5b994
Component: cli
2017-06-02 00:06:36 +00:00
fe3d69425b Expand documentation for --insecure-registries
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: c773557121
Component: cli
2017-06-02 00:06:36 +00:00
20491c04c2 make http usage for registry explicit
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

Conflicts:
	daemon/config.go
	daemon/daemon.go
	graph/pull.go
	graph/push.go
	graph/tags.go
	registry/registry.go
	registry/service.go
Upstream-commit: 15490a58b2
Component: cli
2017-06-02 00:06:36 +00:00
20075627ab Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Add some information about the storage and execution driver choices

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 22c0b17eb2
Component: cli
2017-06-02 00:06:36 +00:00
c2df77647a Add DOCKER_TLS_VERIFY environment variable, equivalent to --tlsverify flag
This makes it possible to make the Docker client "secure by default"
without wrapping the binary in a shell alias so that `--tlsverify` is
always passed.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: 57d75938cd
Component: cli
2017-06-02 00:06:36 +00:00