Commit Graph

709 Commits

Author SHA1 Message Date
Lars Kellogg-Stedman c6bcaacce7 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>
2017-06-02 00:06:55 +00:00
HuKeping 16d979a292 Feature: option for disable OOM killer
Add cgroup support for disable OOM killer.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2017-06-02 00:06:55 +00:00
Tianon Gravi 14411fae61 Only complete repos with "docker pull -a"
With this, `docker pull deb<tab>` will show all `debian:*` tags, as before, but `docker pull -a deb<tab>` will complete directly to just `debian`. 👍

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2017-06-02 00:06:55 +00:00
Jessica Frazelle 109f9996a9 option to configure cgroups
Signed-off-by: Jessica Frazelle <jess@docker.com>
2017-06-02 00:06:55 +00:00
Jessica Frazelle 734430c44c 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)
2017-06-02 00:06:55 +00:00
buddhamagnet 63193b17b1 add support for exclusion rules in dockerignore
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com>
2017-06-02 00:06:55 +00:00
Ed Costello fcf01194a9 Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
2017-06-02 00:06:55 +00:00
David Calavera 72f4a6bc1c Document the extra `depth` argument in git contexts.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2017-06-02 00:06:55 +00:00
Lei Jitang 433f49684e Add cpu cfs quota to build
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2017-06-02 00:06:55 +00:00
Tristan Carel 3f2bc86a4f Fix typo in builder reference
Signed-off-by: Tristan Carel <tristan.carel@gmail.com>
2017-06-02 00:06:54 +00:00
Rick Wieman acc0eac695 Makes headings in documentation consistent
Fixes #10673.

Signed-off-by: Rick Wieman <git@rickw.nl>
2017-06-02 00:06:54 +00:00
Dan Walsh 33e6a5b9c5 Add journald as a supported logger for containers
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2017-06-02 00:06:54 +00:00
Jeff Nickoloff 8bf56348e9 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>
2017-06-02 00:06:54 +00:00
Shijiang Wei 66d3021b49 Remove some unsupported instructions in the docs.
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2017-06-02 00:06:54 +00:00
Lei Jitang 6c60a3415c Add support cpu cfs quota
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2017-06-02 00:06:54 +00:00
Arnaud Porterie f00c5d0720 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>
2017-06-02 00:06:54 +00:00
Sylvain Baubeau 7604419278 Allow specifying a default gateway for bridge networking
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
2017-06-02 00:06:54 +00:00
Doug Davis 9dd7c2c70d 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>
2017-06-02 00:06:54 +00:00
Qiang Huang 39840874a3 Add cpuset-mems support for docker build
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2017-06-02 00:06:54 +00:00
Qiang Huang 84861b2109 add support for cpuset.mems
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2017-06-02 00:06:54 +00:00
wonderflow 2040dff996 fix memory stats display document
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
2017-06-02 00:06:54 +00:00
Lei Jitang cae7221b8d Add docker exec run a command in privileged mode
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2017-06-02 00:06:54 +00:00
Lei Jitang 3ca275df6d Add `-u|--user` flag to docker exec for running command as a different user
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2017-06-02 00:06:54 +00:00
jianbosun a878ece032 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>
2017-06-02 00:06:54 +00:00
Bryan Boreham 07ee4d5ec2 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>
2017-06-02 00:06:54 +00:00
Eric Windisch b22aaac047 HTTPS URLs for docs top-level & man pages
This updates all of docs outside of sources.

Signed-off-by: Eric Windisch <eric@windisch.us>
2017-06-02 00:06:54 +00:00
Deng Guangxing d5fb91f48c '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>
2017-06-02 00:06:53 +00:00
Vincent Batts c121c24125 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>
2017-06-02 00:06:53 +00:00
Ahmet Alp Balkan 298268dd0a 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>
2017-06-02 00:06:53 +00:00
Tibor Vass 31e77481ff Rebase + some fixes
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-06-02 00:06:53 +00:00
David Young 6ad4157d89 Refine document by review comments
Signed-off-by: David Young <yangboh@cn.ibm.com>
2017-06-02 00:06:53 +00:00
David Young b43ebd8449 Add comment column in docker history command output
Signed-off-by: David Young <yangboh@cn.ibm.com>
2017-06-02 00:06:53 +00:00
Yan Feng cd83db8e07 Fix a typo in /doc/sources/reference/run.md
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
2017-06-02 00:06:53 +00:00
Mary Anthony 959ae3c211 Carry PR 12008 for contributor
Closes #8040
Remove a tic for the hawk

Signed-off-by: Mary Anthony <mary@docker.com>
2017-06-02 00:06:53 +00:00
Yan Feng 4836b6041a Fix 2 typos in /doc/sources/reference/run.md
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
2017-06-02 00:06:53 +00:00
Deng Guangxing 850a1672bb docker info show logging driver info
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2017-06-02 00:06:53 +00:00
Simei He 4f146e1a81 fix the space thing.
Signed-off-by: Simei He <hesimei@zju.edu.cn>
2017-06-02 00:06:53 +00:00
Simei He 097e382e78 minor edits.
Signed-off-by: Simei He <hesimei@zju.edu.cn>
2017-06-02 00:06:53 +00:00
dalanlan a4c88adc4d fix issue #11676 #11754, disable RLIMIT_AS,edit DOCKER_OPTS
Signed-off-by: Simei He <hesimei@zju.edu.cn>
2017-06-02 00:06:53 +00:00
Deng Guangxing e2ecc5c6de fix typo in cli.md
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2017-06-02 00:06:53 +00:00
Sebastiaan van Stijn 48add9c908 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>
2017-06-02 00:06:53 +00:00
Lei Jitang 26c3652d5e Add some missing option to bash completion
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2017-06-02 00:06:53 +00:00
Doug Davis efc478e33c Add support for more advanced ${xxx:...} syntax
Just ${xxx:+...} and ${xxx:-...} for now

Signed-off-by: Doug Davis <dug@us.ibm.com>
2017-06-02 00:06:52 +00:00
Sebastiaan van Stijn 07995c4ef3 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>
2017-06-02 00:06:52 +00:00
Harry Zhang 5ed0d9c3de Revison the some columns to make table clearer
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
2017-06-02 00:06:52 +00:00
Harry Zhang 5b000494ee Remove dupllicated prefix to make table shorter & fix bugs
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
2017-06-02 00:06:52 +00:00
cheney90 0864264159 Add capabilities list information table.
Signed-off-by: Chen Qiu <21321229@zju.edu.cn>
2017-06-02 00:06:52 +00:00
Harald Albers d0fefccd8d Add missing filters to bash completion for docker images and docker ps
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:06:52 +00:00
Harald Albers 4d5758b252 Do not complete --cgroup-parent as _filedir
This is a follow-up on PR 11708, as suggested by tianon.

Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:06:52 +00:00
Daniel, Dao Quang Minh 729035faff document dirperm1 fix for #783 in known issues
Since `dirperm1` requires a more recent aufs patch than many current OS release,
we cant remove #783 completely. This documents that docker will apply `dirperm1`
automatically for systems that support it

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
2017-06-02 00:06:52 +00:00