Commit Graph

162 Commits

Author SHA1 Message Date
f5cecee8a9 Update flag usages and docs for max restart count
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 496b9b1977
Component: cli
2017-06-02 00:06:33 +00:00
972e9fca2a Cleanup: correct cli --volumes-from description
issue #7580 volumes-from comma separated list mentioned this case.

Options like --volumes-from=[] indicate they can be specified multiple times:
docker run -it --rm --volumes-from TEST_DATA --volumes-from TEST_DATA2 ubuntu bash

Signed-off-by: Deshi Xiao <dxiao@redhat.com>
Upstream-commit: 46121c5edd
Component: cli
2017-06-02 00:06:32 +00:00
fe6c696a10 update the cli / man page docs based on what is in master right now
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: d8b3ccd869
Component: cli
2017-06-02 00:06:32 +00:00
0be916edb1 Deprecate --restart on the daemon
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 0142098e67
Component: cli
2017-06-02 00:06:32 +00:00
2a85b5d64f Update docs based on feedback from review for --restart
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 9d8d982e5c
Component: cli
2017-06-02 00:06:32 +00:00
37792aa6c2 Add documentation and update restart rules.
Implement time backed backoff for restarting and fix failure count when
the maximum is 0

Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 8f67e34cba
Component: cli
2017-06-02 00:06:32 +00:00
8af77489b3 Move remote API config out of daemon/
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 9f2253c926
Component: cli
2017-06-02 00:06:32 +00:00
214134c5dd docker ps: introducing filters
* starting with filtering for exit codes. `docker ps -a --filter 'exited=1'`
* API doc for filter parameter
* formatting filters for help usage
* tweaks for review

This requires https://github.com/dotcloud/docker/pull/4430

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: b1aa5d84a7
Component: cli
2017-06-02 00:06:32 +00:00
ffe707ea52 fix command output examples in cli documentation
f87a97f accidentally added a few too many `$` line prefixes

Docker-DCO-1.1-Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com> (github: phemmer)
Upstream-commit: 827784fc31
Component: cli
2017-06-02 00:06:32 +00:00
588987f681 Revert rm -f deprecation use SIGKILL instead
`rm -f` was originally deprecated in favor of `rm --stop/--kill` since `rm
-f` was sending SIGTERM and potentially very slow.
Instead this will bring back `rm -f` but use SIGKILL isntead

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 3c5c02ba5a
Component: cli
2017-06-02 00:06:32 +00:00
1c8efb4405 Docker should use /var/lib/container/tmp for large temporary files.
/tmp is often a tmpfs file system and large temporary files could cause
docker commands to fail.  Also using /tmp potentially allows users on the
system to get access to content, or even attack the content.  Moving the tmpdir to
/var/lib/container/tmp will protect the data.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)

Conflicts:
	docker/docker.go
Upstream-commit: 6d9e4e513a
Component: cli
2017-06-02 00:06:32 +00:00
ab3f1442d0 Add OS to docker info
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 0e2490cad0
Component: cli
2017-06-02 00:06:32 +00:00
5aee68c291 update go import path and libcontainer
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 4fc06d1790
Component: cli
2017-06-02 00:06:32 +00:00
4f7156cf7b user facing documentation changes in master atm
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: a5b9d338c1
Component: cli
2017-06-02 00:06:32 +00:00
f078103f43 Update docs on --sig-proxy to indicate that SIGKILL and SIGSTOP cannot be proxied
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: 73a3580711
Component: cli
2017-06-02 00:06:32 +00:00
9c3b1e5f75 fix doc references
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Upstream-commit: c66ab76c1a
Component: cli
2017-06-02 00:06:31 +00:00
34b3bfca6e Add logout command
"docker logout [SERVER]" will remove the registry server' credentials from
.dockercfg file. If a server is not specified, it will log user out of the
default docker registry server

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Upstream-commit: eaca49cde5
Component: cli
2017-06-02 00:06:31 +00:00
6a11dc1697 re-jig the info into all the places
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 4cb8ed8f9d
Component: cli
2017-06-02 00:06:31 +00:00
1572f061f5 Add cgroups freezer info
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: SvenDowideit)
Upstream-commit: ed82ad88da
Component: cli
2017-06-02 00:06:31 +00:00
4cfb9c2ec6 Add cli.md documentation for docker-pause and docker-unpause
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: c0199886cd
Component: cli
2017-06-02 00:06:31 +00:00
a9f791eac6 update CLI & api docs
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: 1bb925be97
Component: cli
2017-06-02 00:06:31 +00:00
f8878bc07f Add --device flag to allow additional host devices in container
We add a --device flag which can be used like:

 docker run --device /dev/sda:/dev/xvda:rwm ubuntu /bin/bash

To allow the container to have read write permissions to access the host's /dev/sda via a node named /dev/xvda in the container.

Note: Much of this code was written by Dinesh Subhraveti dineshs@altiscale.com (github: dineshs-altiscale) and so he deserves a ton of credit.

Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: timthelion)
Upstream-commit: 57b53e22fe
Component: cli
2017-06-02 00:06:31 +00:00
6452b6495d Updated docker logs timestamp to RFC3339
Currently the docker logs timestamp flag generates log entries like:

    $ sudo docker logs -ft daemon_dave
    [May 10 13:06:17.934] hello world

It uses Go's StampMilli timestamp to generate the timestamp. The entry
is also wrapped in [ ].

This is non-standard operational timestamp and one that will require
custom parsing.

The new timestamp is RFC3999Nano and generates entries like:

    2014-05-10T17:42:14.999999999Z07:00 hello world

These are readily parsed by tools like ELK.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 64271a2aa3
Component: cli
2017-06-02 00:06:31 +00:00
42d1fc470e Error if Docker daemon starts with BTRFS graph driver and SELinux enabled
The Docker btrfs graph driver does not interact well with SELinux at present.
If btrfs mounts the same file in several locations, the same SELinux label will
be applied to all mountpoints. In the context of the graph driver, things such
as shared libraries become inaccessible to containers due to SELInux, causing
all dynamically linked applications to fail when run in a container.

Consequently, error when we detect the daemon is being run with SELinux enabled
and the btrfs driver. Documentation has been added for this behavior.

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: 8c2470323d
Component: cli
2017-06-02 00:06:31 +00:00
347f366c57 Update cli.md and man pages to match current cli
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 0db5ead653
Component: cli
2017-06-02 00:06:30 +00:00
f4a23ea0fe Lowercase world, because its not important.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 094fa1b8fd
Component: cli
2017-06-02 00:06:30 +00:00
0cda470d70 update docs
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 0c845f3f41
Component: cli
2017-06-02 00:06:30 +00:00
30031e089b Implement tail for docker logs
Fixes #4330
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: a9bea1525c
Component: cli
2017-06-02 00:06:30 +00:00
2b487e12ac more docs for dockerignore
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: e7e6ff5e6f
Component: cli
2017-06-02 00:06:30 +00:00
05a6a78092 updated docs & tests
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: db5c70afe4
Component: cli
2017-06-02 00:06:30 +00:00
05b25490b7 Pause/freeze containers during commit
Initiates a pause before committing a container,
adds a pause option to the commit command, defaulting to 'true'.

Fixes bug: #6267
Fixes bug: #3675

Docker-DCO-1.1-Signed-off-by: Eric Windisch <ewindisch@docker.com> (github: ewindisch)
Upstream-commit: 3775c33ab9
Component: cli
2017-06-02 00:06:30 +00:00
6bd98835aa blindly make all uses of e\.?g\.? into e.g.,
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: dd0cd23fd7
Component: cli
2017-06-02 00:06:30 +00:00
f343b92dbb Formatting and consistency fixes to CLI and RUN references
* Removed double backticks.
* Reformatted paragraphs.
* Fixed consistent STDOUT/STDIN/STDERR references.
* Fixed several broken URLs.
* Fixed backtick mismatches.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: dce7a15eda
Component: cli
2017-06-02 00:06:30 +00:00
27dc8f3166 Update documentation noting that SIGCHLD is not proxied.
Docker's --sig-proxy option sends all signals but one to a container. The
exception s SIGCHLD, which is deliberately ignored as it doesn't make sense to
send such a signal to a process in a container. Documentation updates will make
this less confusing if anyone does attempt to do this.

Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: 382814d8d8
Component: cli
2017-06-02 00:06:30 +00:00
a489dcdfc6 Add .dockerignore support
Fixes #2224

Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
Upstream-commit: ebb9d58225
Component: cli
2017-06-02 00:06:30 +00:00
f20a110545 Anglicanisms: Grammatical correction (pos. adj. apost.)
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 742b229408
Component: cli
2017-06-02 00:06:30 +00:00
0eeca9686e Add the missing paren to the documentation for docker commit too
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: fe1e15dad4
Component: cli
2017-06-02 00:06:30 +00:00
328a706f73 Add Sockets (-H) list to docker -D info.
This will allow us to _know_ what the user's -H settings are, which may
be useful for debugging later.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 6c8a3f798b
Component: cli
2017-06-02 00:06:30 +00:00
6d5a7032bc api/client/build: allow tar as context for docker build -
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 56b7c20e46
Component: cli
2017-06-02 00:06:29 +00:00
ca4a74c898 be consistent in capitalization of Docker
Docker-DCO-1.1-Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com> (github: jonboulle)
Upstream-commit: 6cc9c5bd42
Component: cli
2017-06-02 00:06:29 +00:00
7b2c5a2fee The docker run --dns does not resolve hostname and having hostname in resolv.conf does not work.
Docker-DCO-1.1-Signed-off-by: Jan Pazdziora <jpazdziora@redhat.com> (github: adelton)
Upstream-commit: 2f908862e3
Component: cli
2017-06-02 00:06:29 +00:00
00fa207eb1 Updated CLI documentation for docker pull with notes on specifying URL
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: 45496ca4f1
Component: cli
2017-06-02 00:06:29 +00:00
d433dfda08 Fix several typos
Docker-DCO-1.1-Signed-off-by: Michael Prokop <github@michael-prokop.at> (github: mika)
Upstream-commit: 3ca0eb652b
Component: cli
2017-06-02 00:06:29 +00:00
a1e8edc426 Initial links
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: cf6acae39b
Component: cli
2017-06-02 00:06:29 +00:00
9a6efb2269 Add --storage-opt graph driver option and pass through to driver
This lets you add storage specific options for the daemon.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 655fe238c5
Component: cli
2017-06-02 00:06:29 +00:00
0b30245939 Clarify effect of docker start on started container in CLI docs
This behavior changed from v0.9 to v0.10, so document it to prevent
any confusion.

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: 8fc62f6ec3
Component: cli
2017-06-02 00:06:29 +00:00
e6053e16c7 Revert "Initial links for Docker Hub rename"
This reverts commit 2819677c215bd409b4ce4da51f0ddfb303760796.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 52488445a5
Component: cli
2017-06-02 00:06:28 +00:00
9ec4ac9265 Initial links for Docker Hub rename
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: faffc555ab
Component: cli
2017-06-02 00:06:28 +00:00
c35401aba5 Change 'Uploading context' wording
Docker-DCO-1.1-Signed-off-by: Ryan Stelly <ryan.stelly@live.com> (github: FLGMwt)
Upstream-commit: 47f850e550
Component: cli
2017-06-02 00:06:28 +00:00
2319cfb40b IANA allocated Docker port: 2375
2375/2376 are assigned:
http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker

For #1440

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 6fa1105051
Component: cli
2017-06-02 00:06:28 +00:00