Commit Graph

859 Commits

Author SHA1 Message Date
wlan0 bbbac1c21c Add log opts flag to pass in logging options
Signed-off-by: wlan0 <sidharthamn@gmail.com>
Upstream-commit: 9949905359
Component: cli
2017-06-02 00:06:55 +00:00
Lei Jitang 8834d9e361 Add support --net=container with --mac-address,--add-host error out
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 68f8a90e3d
Component: cli
2017-06-02 00:06:55 +00:00
Qiang Huang db297e1322 add blkio.weight support
We can use this to control block IO weight of a container.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 19815c878d
Component: cli
2017-06-02 00:06:55 +00:00
Arnaud Porterie 35d282f75f Add --userland-proxy daemon flag
The `--userland-proxy` daemon flag makes it possible to rely on hairpin
NAT and additional iptables routes instead of userland proxy for port
publishing and inter-container communication.

Usage of the userland proxy remains the default as hairpin NAT is
unsupported by older kernels.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: ee666e8d4b
Component: cli
2017-06-02 00:06:55 +00:00
Marianna 51de3c55fb Make the docs for --cgroup-parent better
Signed-off-by: Marianna <mtesselh@gmail.com>
Upstream-commit: 2cf6bfdc61
Component: cli
2017-06-02 00:06:55 +00:00
Julien Barbier 34c283fd66 Adding doc
Signed-off-by: Julien Barbier <write0@gmail.com>
Upstream-commit: 3fca935671
Component: cli
2017-06-02 00:06:55 +00:00
Brian Goff 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
Sven Dowideit ca3e83257e spelling fix from Marc MERLIN
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 5b8040c935
Component: cli
2017-06-02 00:06:55 +00:00
David Calavera 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
Lars Kellogg-Stedman d6953e86b7 journald log driver: use CONTAINER_ID field for container id
This patch modifies the journald log driver to store the container ID in
a field named CONTAINER_ID, rather than (ab)using the MESSAGE_ID field.
Additionally, this adds the CONTAINER_ID_FULL field containing the
complete container ID and CONTAINER_NAME, containing the container name.

When using the journald log driver, this permits you to see log messages
from a particular container like this:

    # journalctl CONTAINER_ID=a9238443e193

Example output from "journalctl -o verbose" includes the following:

    CONTAINER_ID=27aae7361e67
    CONTAINER_ID_FULL=27aae7361e67e2b4d3864280acd2b80e78daf8ec73786d8b68f3afeeaabbd4c4
    CONTAINER_NAME=web

Closes: #12864
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
Upstream-commit: c6bcaacce7
Component: cli
2017-06-02 00:06:55 +00:00
HuKeping 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
Jessica Frazelle 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
Jessica Frazelle 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
buddhamagnet 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
Ed Costello 4da3316cfb Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
Upstream-commit: fcf01194a9
Component: cli
2017-06-02 00:06:55 +00:00
David Calavera 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
Tristan Carel 147f85cdb4 Fix typo in builder reference
Signed-off-by: Tristan Carel <tristan.carel@gmail.com>
Upstream-commit: 3f2bc86a4f
Component: cli
2017-06-02 00:06:54 +00:00
Rick Wieman 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
Dan Walsh 1d8626a153 Add journald as a supported logger for containers
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 33e6a5b9c5
Component: cli
2017-06-02 00:06:54 +00:00
Jeff Nickoloff 39d45439fe Update builder.md
Single value labels do not work in 1.6 and multi-label instructions only work when separated by non-EOL whitespace.
I also added an example snip from the inspect output with the labels that are included in this guide.

Signed-off-by: Jeff Nickoloff <jeff@allingeek.com>
Upstream-commit: 8bf56348e9
Component: cli
2017-06-02 00:06:54 +00:00
Shijiang Wei 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
Lei Jitang 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
Arnaud Porterie 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
Sylvain Baubeau 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
Doug Davis 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
Qiang Huang 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
Qiang Huang 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
wonderflow 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
Lei Jitang 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
Lei Jitang 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
jianbosun 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
Bryan Boreham 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
Eric Windisch e99fbca7ff HTTPS URLs for docs top-level & man pages
This updates all of docs outside of sources.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: b22aaac047
Component: cli
2017-06-02 00:06:54 +00:00
Deng Guangxing 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
Vincent Batts 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
Ahmet Alp Balkan 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
Tibor Vass 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
David Young 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
David Young 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
Yan Feng 5ed6667bf3 Fix a typo in /doc/sources/reference/run.md
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: cd83db8e07
Component: cli
2017-06-02 00:06:53 +00:00
Mary Anthony 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
Yan Feng 5a729dc4e8 Fix 2 typos in /doc/sources/reference/run.md
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: 4836b6041a
Component: cli
2017-06-02 00:06:53 +00:00
Deng Guangxing 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
Simei He 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
Simei He 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
dalanlan 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
Deng Guangxing 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
Sebastiaan van Stijn 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
Doug Davis 14004cb76b Add support for more advanced ${xxx:...} syntax
Just ${xxx:+...} and ${xxx:-...} for now

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: efc478e33c
Component: cli
2017-06-02 00:06:52 +00:00
Sebastiaan van Stijn 2568ea2e48 Fix heading level of logging drivers
Syslog was a heading-2, but should be heading-3;
changed the headings to heading-4 to match the
"network settings" section.

Also changed "Log driver" to "logging driver" for JSON.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 07995c4ef3
Component: cli
2017-06-02 00:06:52 +00:00