Commit Graph
1009 Commits
Author SHA1 Message Date
Alexander Morozov fd7016c7a6 Use fs cgroups by default
Our implementation of systemd cgroups is mixture of systemd api and
plain filesystem api. It's hard to keep it up to date with systemd and
it already contains some nasty bugs with new versions. Ideally it should
be replaced with some daemon flag which will allow to set parent systemd
slice.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 941952972e
Component: cli
2017-06-02 00:07:17 +00:00
Vincent Demeester 01bd0ad8c4 Fix a small typo in volume_inspect.md
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3317b8b16d
Component: cli
2017-06-02 00:07:17 +00:00
Vincent Bernat 786163b516 zsh: ensure we have enough commands to store in the cache
Otherwise, the cache would be invalid and won't be refreshed soon. This
can happen when the user has the completion installed before docker is
installed.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 00ea341609
Component: cli
2017-06-02 00:07:17 +00:00
Vincent Bernat 7ec7373309 zsh: remove lxc-related completion
LXC support has been deprecated and the related completion has been
removed in #17700 but was added back in #17334.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 7eac998e7d
Component: cli
2017-06-02 00:07:17 +00:00
Steve Durrheimer 8e9e9a12e6 Add zsh completion for log options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 2788cfa614
Component: cli
2017-06-02 00:07:17 +00:00
Vincent Demeester 9c2296cf9c Add pkg/parsers/architecture and pkg/platform
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8ab8a0f3c5
Component: cli
2017-06-02 00:07:17 +00:00
Olle Jonsson e68ca3e6e8 /info: Add keys Architecture, OSType
- introduces Swarm-relevant keys, see #13634
  - docs updated

Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
Upstream-commit: 1de6fda301
Component: cli
2017-06-02 00:07:17 +00:00
Dan Walsh b13bcd56d3 Relabel BTRFS Content on container Creation
This change will allow us to run SELinux in a container with
BTRFS back end.  We continue to work on fixing the kernel/BTRFS
but this change will allow SELinux Security separation on BTRFS.

It basically relabels the content on container creation.

Just relabling -init directory in BTRFS use case. Everything looks like it
works. I don't believe tar/achive stores the SELinux labels, so we are good
as far as docker commit.

Tested Speed on startup with BTRFS on top of loopback directory. BTRFS
not on loopback should get even better perfomance on startup time.  The
more inodes inside of the container image will increase the relabel time.

This patch will give people who care more about security the option of
runnin BTRFS with SELinux.  Those who don't want to take the slow down
can disable SELinux either in individual containers or for all containers
by continuing to disable SELinux in the daemon.

Without relabel:

> time docker run --security-opt label:disable fedora echo test
test

real    0m0.918s
user    0m0.009s
sys    0m0.026s

With Relabel

test

real    0m1.942s
user    0m0.007s
sys    0m0.030s

Signed-off-by: Dan Walsh <dwalsh@redhat.com>

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 212fe5f2d0
Component: cli
2017-06-02 00:07:17 +00:00
Kunal Kushwaha c6c59e87c6 Supported added for reterving Plugin list for Network and Volume.
Also, plugin information in docker info output.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
Upstream-commit: b1287de07b
Component: cli
2017-06-02 00:07:17 +00:00
Denis Gladkikh d75645ebf8 Allow configurable metadata for Splunk log driver
Add support of `tag`, `env` and `labels` for Splunk logging driver.
Removed from message `containerId` as it is the same as `tag`.

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
Upstream-commit: a148373062
Component: cli
2017-06-02 00:07:17 +00:00
Zhang Kun 3f98c82117 fix doc
Signed-off-by: Zhang Kun <zkazure@gmail.com>

fix doc

Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: e71bd977cf
Component: cli
2017-06-02 00:07:17 +00:00
Harald Albers 1b35ef26d9 bash completion for docker {run,create} --volume-driver
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d998542977
Component: cli
2017-06-02 00:07:17 +00:00
Doug Davis 5f568c0605 Support multi-dir wildcards in .dockerignore
Closes #13113

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 4978171903
Component: cli
2017-06-02 00:07:17 +00:00
pidster 6d94a558c9 Add Weave Network Plugin to docs/extend/plugins.md
Signed-off-by: pidster <pid@pidster.com>
Upstream-commit: 564b68091e
Component: cli
2017-06-02 00:07:17 +00:00
Ma Shimiao 3804fbd740 Add support for blkio.weight_device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: e303d6cc9f
Component: cli
2017-06-02 00:07:17 +00:00
Sally O'Malley 29e36723a8 docker-login man/doc add security info
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: d6bac18914
Component: cli
2017-06-02 00:07:17 +00:00
Sebastiaan van Stijn 16da59f6de docs: fix link to "run reference"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e1f83cb82b
Component: cli
2017-06-02 00:07:16 +00:00
Steve Durrheimer a1344a583d Add zsh completion for 'docker {run,create} --volume-driver'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: c14094b895
Component: cli
2017-06-02 00:07:16 +00:00
Viktor Stanchev e5cbd3704c more notary documentation
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
Upstream-commit: cfe0fadee2
Component: cli
2017-06-02 00:07:16 +00:00
Anusha Ragunathan c6af22c130 Include xfsprogs in build environment.
devmapper uses xfs by default now. So include xfsprogs in build
environment. Also update docs to reflect the new default.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 555f500ab4
Component: cli
2017-06-02 00:07:16 +00:00
Mary Anthony 33385ee8ee Adding in Contiv plugins
Fixes #17764
Also fixed problem where the menu ordering was off
Fix the wrap

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 08918a09ea
Component: cli
2017-06-02 00:07:16 +00:00
Harald Albers 2201b8350a Align configuration of bash completion with existing values
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2c0feab2a1
Component: cli
2017-06-02 00:07:16 +00:00
John Howard 2701f1ceb8 Removing made up word
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f5f5b31358
Component: cli
2017-06-02 00:07:16 +00:00
Harald Albers e9341465ae Fix bash completion on systems where extglob is not set
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 7fa96238a6
Component: cli
2017-06-02 00:07:16 +00:00
John Howard 2a910ab5a6 Windows: Add default isolation exec driver option
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 52f5fdafc1
Component: cli
2017-06-02 00:07:16 +00:00
Gou Rao b76ab8584e Update plugins.md
Signed-off-by: Gou Rao <gou@portworx.com>
Upstream-commit: f94eb3af9e
Component: cli
2017-06-02 00:07:16 +00:00
Gou Rao 572c3b97c4 Update plugins.md
Add OpenStorage to Docker plugin list.

Signed-off-by: Gou Rao <gou@portworx.com>
Upstream-commit: ee8a0a8cd4
Component: cli
2017-06-02 00:07:16 +00:00
Kai Qiang Wu(Kennan) 8be9d4f383 Fixing wrong volume doc format
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 161b465e47
Component: cli
2017-06-02 00:07:16 +00:00
Steve Durrheimer 17a77b775b Add zsh completion for 'docker stats --all -a'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 661cab4af3
Component: cli
2017-06-02 00:07:16 +00:00
Zhang Wei 5728fa8a19 Fix man pages
Add contents and fix format problem for man pages.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 1a495e2d47
Component: cli
2017-06-02 00:07:16 +00:00
Harald Albers 5a8a374f3e bash completion for docker stats --all
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2607803a34
Component: cli
2017-06-02 00:07:16 +00:00
Antonio Murdaca 3222bcadf4 Allow docker stats without arguments
This patch adds the ability to run `docker stats` w/o arguments and get
statistics for all running containers by default. Also add a new
`--all` flag to list statistics for all containers (like `docker ps`).
New running containers are added to the list as they show up also.
Add integration tests for this new behavior.
Docs updated accordingly. Fix missing stuff in man/commandline
reference for `docker stats`.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 4668b6ed6c
Component: cli
2017-06-02 00:07:16 +00:00
Guilhem Lettron dcd7b065fd Fix missing -d flag in docker.fish
Signed-off-by: Guilhem Lettron <guilhem@lettron.fr>
Upstream-commit: f239640a2e
Component: cli
2017-06-02 00:07:16 +00:00
Christopher Jones f054c65ab0 Updated link to https.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 2d5de1dd85
Component: cli
2017-06-02 00:07:16 +00:00
Christopher Jones 3412f77bee Fixed link to contribution page in docs/README.md.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: c681d6812a
Component: cli
2017-06-02 00:07:15 +00:00
David Calavera 50fbc6f6bd Remove exec-driver global daemon option.
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f9b805f16f
Component: cli
2017-06-02 00:07:15 +00:00
David Calavera 5ab60b10fd Remove LXC support.
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: c5ed875bd9
Component: cli
2017-06-02 00:07:15 +00:00
John Howard 831fc32309 Windows: Add isolation to ps filter
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b6c711690c
Component: cli
2017-06-02 00:07:15 +00:00
Zhang Wei 71b2b853cc Fix docs typo and wrong word
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: e8a0a5c4f4
Component: cli
2017-06-02 00:07:15 +00:00
harold cooper 39ae201697 fix documentation inconsistency for volume create
the example command uses `/world` but the description refers to `/src`

Signed-off-by: Harold Cooper <hrldcpr@gmail.com>
Upstream-commit: e793642ac9
Component: cli
2017-06-02 00:07:15 +00:00
Sally O'Malley ce4e79a2a8 Change 'docker run' exit codes to distinguish docker/contained errors
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise

Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: c48ec056d5
Component: cli
2017-06-02 00:07:15 +00:00
rsmoorthy 7f5cb98ede multiple mount/unmount req with same volume name
Updating docs to handle mount/unmount requests with same volume name. Issue #17585

Signed-off-by: Moorthy RS <rsmoorthy@gmail.com>
Upstream-commit: 904cadc0c2
Component: cli
2017-06-02 00:07:15 +00:00
Madhu Venugopal b4acd55a6d Updating networking docs with technical information
- the /etc/hosts read caveat due to dynamic update
- information about docker_gwbridge
- Carries and closes #17654
- Updating with last change by Madhu
- Updating with the IPAM api 1.22

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 2d486b08c8
Component: cli
2017-06-02 00:07:15 +00:00
Mary Anthony 6e6828db93 Fixing ZooKeeper and some other nits Nathan found
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7e68b5f73b
Component: cli
2017-06-02 00:07:15 +00:00
Mary Anthony 8050e305f6 First pass at consolidating
Removing old networking.md
Updating dockernetworks.md with images
Adding information on network plugins
Adding blurb about links to docker networking
Updating the working documentation
Adding Overlay Getting Started
Downplaying links by removing refs/examples, adding refs/examples for network.
Updating getting started to reflect networks not links
Pulling out old network material
Updating per discussion with Madhu to add Default docs section
Updating with bridge default
Fix bad merge
Updating with new cluster-advertise behavior
Update working and NetworkSettings examples
Correcting example for default bridge discovery behavior
Entering comments
Fixing broken Markdown Syntax
Updating with comments
Updating all the links

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 02a859b9f3
Component: cli
2017-06-02 00:07:15 +00:00
Eric Rosenberg 986b7e312c Update kill.md
Added Note to show users that signals will not propagate to the container if the preferred exec form isn't used.

Signed-off-by: Eric Rosenberg <ehaydenr@gmail.com>
Upstream-commit: 05242a4c60
Component: cli
2017-06-02 00:07:15 +00:00
Mary Anthony b0b9294f03 Updating network commands: adding man pages
Adding Related information blocks
Final first draft pass: ready for review
Review comments
Entering comments from the gang
Updating connect to include paused

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 4985b20ea1
Component: cli
2017-06-02 00:07:15 +00:00
Steve Durrheimer 2de3c9f772 Fix missing double quote in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 7f6859ce5a
Component: cli
2017-06-02 00:07:15 +00:00
Vincent Bernat bc09bd9da3 zsh: allow option stacking for short options without arguments
This enables Zsh to understand commands like "docker run -it
ubuntu". However, by enabling this, this also makes Zsh completes
"docker run -u<tab>" with "docker run -uapprox" which is not valid. The
users have to put the space or the equal sign themselves before trying
to complete.

Therefore, this behavior is disabled by default. To enable it:

    zstyle ':completion:*:*:docker:*' option-stacking yes
    zstyle ':completion:*:*:docker-*:*' option-stacking yes

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: b10fb43048
Component: cli
2017-06-02 00:07:15 +00:00
Vincent Bernat 052dd3f6a8 zsh: allow short options to specify their arguments with "="
This is allowed by Docker and helps the completion to not get confused
when a user uses this notation. This will also help to enable stacking
of short options since Zsh needs that to not stack options with
arguments.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 2102746489
Component: cli
2017-06-02 00:07:15 +00:00