Commit Graph

378 Commits

Author SHA1 Message Date
d3cd09fb11 Allow pulling stats once and disconnecting.
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.

Also adds a `--no-stream` flag to `docker stats` which does the same

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 485c6d868b
Component: cli
2017-06-02 00:06:55 +00:00
a91cf05860 Use git url fragment to specify reference and dir context.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: bbfd8f5e04
Component: cli
2017-06-02 00:06:55 +00:00
0180f3810e Feature: option for disable OOM killer
Add cgroup support for disable OOM killer.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 16d979a292
Component: cli
2017-06-02 00:06:55 +00:00
7b62110c7d option to configure cgroups
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 109f9996a9
Component: cli
2017-06-02 00:06:55 +00:00
9956e4d35a Add docs for --exec-opt and setting native.cgroupdriver.
update man pages.
update bash completion.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 734430c44c
Component: cli
2017-06-02 00:06:55 +00:00
71cca65cf6 add support for exclusion rules in dockerignore
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com>
Upstream-commit: 63193b17b1
Component: cli
2017-06-02 00:06:55 +00:00
38c15ae6cd Document the extra depth argument in git contexts.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 72f4a6bc1c
Component: cli
2017-06-02 00:06:55 +00:00
94d260e45d Makes headings in documentation consistent
Fixes #10673.

Signed-off-by: Rick Wieman <git@rickw.nl>
Upstream-commit: acc0eac695
Component: cli
2017-06-02 00:06:54 +00:00
b9dcb44871 Remove some unsupported instructions in the docs.
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 66d3021b49
Component: cli
2017-06-02 00:06:54 +00:00
e28ed017e0 Add support cpu cfs quota
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 6c60a3415c
Component: cli
2017-06-02 00:06:54 +00:00
76ce20a10c Add -H|--human flag to docker history
Add a flag to print sizes and dates in human readable format.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f00c5d0720
Component: cli
2017-06-02 00:06:54 +00:00
46f11b5f47 Allow specifying a default gateway for bridge networking
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
Upstream-commit: 7604419278
Component: cli
2017-06-02 00:06:54 +00:00
3edad80714 Add .docker/config.json and support for HTTP Headers
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
  but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
  top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
  which adds these http headers to all msgs from the cli

In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 9dd7c2c70d
Component: cli
2017-06-02 00:06:54 +00:00
efac4ac77f Add cpuset-mems support for docker build
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 39840874a3
Component: cli
2017-06-02 00:06:54 +00:00
d9394807a2 add support for cpuset.mems
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 84861b2109
Component: cli
2017-06-02 00:06:54 +00:00
8a5fe0bed0 fix memory stats display document
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Upstream-commit: 2040dff996
Component: cli
2017-06-02 00:06:54 +00:00
38c9ef629e Add docker exec run a command in privileged mode
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: cae7221b8d
Component: cli
2017-06-02 00:06:54 +00:00
ab684537e4 Add -u|--user flag to docker exec for running command as a different user
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3ca275df6d
Component: cli
2017-06-02 00:06:54 +00:00
6eff7eb501 change memory usage display
using standard unix postfixes add unit test for display
also change doc for memory usage display change
for example GiB will be GB

Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Upstream-commit: a878ece032
Component: cli
2017-06-02 00:06:54 +00:00
a384008538 Add a note about PID 1 not terminating on SIGINT/SIGTERM.
Also re-arranged the description of CTRL-c to make it clearer.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: 07ee4d5ec2
Component: cli
2017-06-02 00:06:54 +00:00
0511c4cc92 'docker rmi -f IMAGE_ID' untag all names and delete the image
If an image has been tagged to multiple repos and tags, 'docker
rmi -f IMAGE_ID' will just untag one random repo instead of
untagging all and deleting the image. This patch implement
this. This commit is composed of:

        *untag all names and delete the image

        *add test to this feature

        *modify commandline/cli.md to explain this

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: d5fb91f48c
Component: cli
2017-06-02 00:06:53 +00:00
23e3ea7abe devmapper: storage-opt override for udev sync
This provides an override for forcing the daemon to still attempt
running the devicemapper driver even when udev sync is not supported.

Intended to be a very clear impairment for those choosing to use it. If
udev sync is false, there will still be an error in the daemon logs,
even when the override is in place. The docs have an explicit WARNING.

Including link to the docs for users that encounter this daemon error
during an upgrade.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: c121c24125
Component: cli
2017-06-02 00:06:53 +00:00
36f1773fee cli: Better wording for daemon --log-driver
This flag is passed to the daemon CLI. In my opinion, "Container's
logging driver" is not accurate and refers to 'one container'.

Also the `syslog` driver was missing from the list. Having the list
of all logging drivers won't scale here (should be <80 chars per line)
and we have `rotation` driver coming up in the pipeline as well (gh11485).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 298268dd0a
Component: cli
2017-06-02 00:06:53 +00:00
f1c92dcce0 Rebase + some fixes
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 31e77481ff
Component: cli
2017-06-02 00:06:53 +00:00
7d1130e17a Refine document by review comments
Signed-off-by: David Young <yangboh@cn.ibm.com>
Upstream-commit: 6ad4157d89
Component: cli
2017-06-02 00:06:53 +00:00
812276749f Add comment column in docker history command output
Signed-off-by: David Young <yangboh@cn.ibm.com>
Upstream-commit: b43ebd8449
Component: cli
2017-06-02 00:06:53 +00:00
0a62633cd3 Carry PR 12008 for contributor
Closes #8040
Remove a tic for the hawk

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 959ae3c211
Component: cli
2017-06-02 00:06:53 +00:00
35948fa830 docker info show logging driver info
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: 850a1672bb
Component: cli
2017-06-02 00:06:53 +00:00
4248a36d9f fix the space thing.
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 4f146e1a81
Component: cli
2017-06-02 00:06:53 +00:00
8ef90f8053 minor edits.
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 097e382e78
Component: cli
2017-06-02 00:06:53 +00:00
2b59eb2a38 fix issue #11676 #11754, disable RLIMIT_AS,edit DOCKER_OPTS
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: a4c88adc4d
Component: cli
2017-06-02 00:06:53 +00:00
87d832f221 fix typo in cli.md
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: e2ecc5c6de
Component: cli
2017-06-02 00:06:53 +00:00
89f22b4397 docs: fix bullet list and missing label filter
Some bullet lists didn't render as bullet-lists because
of a missing newline.

Also added missing "label" filter for `docker ps` and
slightly re-worded the header above the supported filters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 48add9c908
Component: cli
2017-06-02 00:06:53 +00:00
83fec2a376 #11465 Add additional doc for locagi registries onn pull command
Signed-off-by: John Willis <john.willis@docker.com>
Upstream-commit: e1cbe1c398
Component: cli
2017-06-02 00:06:52 +00:00
4fa12af301 Removing sudo from command line examples
We now advise people to configure docker group and
add to sudo.  Mac shouldn't use sudo.  Removed sudo
from command examples.  Left in installation to be removed
in installation doc sweep -- removing requires finer
grain control.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: fb7eb87b94
Component: cli
2017-06-02 00:06:52 +00:00
7ad0b821b5 Rename Fds to File Descriptors in docker info
This makes the docker info more readable. Also change a log line
in a test file renaming Fds

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: bce6adadff
Component: cli
2017-06-02 00:06:52 +00:00
0b778adb78 Add some info about what environment variables are available
Having the list in one spot makes it easier for people to see what's
avaiable instead of having to scan all of the docs and extract the info.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: d25b8ec297
Component: cli
2017-06-02 00:06:51 +00:00
64fd7feaca fix docker ps help message
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
Upstream-commit: 653fdbc2f8
Component: cli
2017-06-02 00:06:51 +00:00
5d40224f3e Added missing code example in the RM command reference of command to delete all stopped containers
Signed-off-by: Natalie Parker <nparker@omnifone.com>
Upstream-commit: 886b571641
Component: cli
2017-06-02 00:06:51 +00:00
1e74a9742a Implement build cancellation
Add the capability to cancel the build by disconnecting the client.

This adds a `cancelled` channel which is used to signal that a build
should halt. The build is halted by sending a Kill signal and noticing
that the cancellation channel is closed.

This first pass implementation does not allow cancellation during a
pull, but that will come in a subsequent PR.

* Add documentation of cancellation to cli and API

* Protect job cancellation with sync.Once

* Add TestBuildCancelationKillsSleep

* Add test case for build cancellation of RUN statements.

Signed-off-by: Peter Waller <p@pwaller.net>
Upstream-commit: e9942aeb8a
Component: cli
2017-06-02 00:06:51 +00:00
a3a26dede6 docs: cli: reorder rename command to be in alphabetical order
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
Upstream-commit: 698b8d3ed0
Component: cli
2017-06-02 00:06:51 +00:00
c9fcb9fc79 Remove 'name' filter from docker events documentation
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: fe7a340316
Component: cli
2017-06-02 00:06:51 +00:00
d0069fd287 Adding integration tests for --cgroup-parent feature.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: d3a6b5adff
Component: cli
2017-06-02 00:06:50 +00:00
59ef98f403 Adding documentation for '--cgroup-parent' option.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: ae117d58d4
Component: cli
2017-06-02 00:06:50 +00:00
e6d3f9945a Allow setting resource constrains for build
Closes #10191

Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: edc7c88640
Component: cli
2017-06-02 00:06:50 +00:00
dc6dc9b463 Modified docker export to allow an --output flag
Copied code from CmdSave into CmdExport. This should work, not an expert in the API calls being made. But it does make more sense to have a consistent export/save flag.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

checkpoint before edits on the export functions

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added an --output flag to docker export and created tests.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

White space cleanup.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Docker-DCO-1.1-Signed-off-by: Joseph Kern <jkern@semafour.net> (github: jfrazelle)

checkpoint before edits on the export functions

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

White space cleanup.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added text to reflect a new output option for the export command.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Whitespace clean up

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added man page documentation for the new --output flag in export

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Upstream-commit: 4aa65f26aa
Component: cli
2017-06-02 00:06:50 +00:00
c59266e9ae Clarify behavior of docker cp
The STDOUT behavior of cp is not yet released in 1.50 so removed.
Also, tested against 1.5 all other behaviors and extended documentation to match.
Renamed HOSTPATH to HOSTDIR to give a self documenting name.

Adding back in the references to STDOUT
fix the command string
Entering Doug's comment re append and ~/tmp/foo in the glass
Adding in Doug's comments regarding PATHs and missing |-
Updating with James comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f1cb33631f
Component: cli
2017-06-02 00:06:50 +00:00
ff8aabb69e Updating with Sven's comments and other tweaks
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: ade615a458
Component: cli
2017-06-02 00:06:50 +00:00
37e848aecb Fail docker logs on all logging drivers apart from 'json-file'
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e30532cf3f
Component: cli
2017-06-02 00:06:50 +00:00
2fb4844dac Default 'json-file' logging driver and none logging driver
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 1459501312
Component: cli
2017-06-02 00:06:50 +00:00