Граф коммитов

26776 Коммитов

Автор SHA1 Сообщение Дата
Vincent Demeester 27043ab718 Merge pull request #25368 from thaJeztah/remove-unused-size-parameter
Remove unused "size" query parameter for images
2016-08-17 09:28:51 +02:00
Steve Durrheimer 25009687be
Add zsh completion for 'docker {network,volume} ls --format'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-08-17 08:21:15 +02:00
Steve Durrheimer d1870019a0
Add zsh completion for 'docker volume ls --filter label'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-08-17 08:15:26 +02:00
Denis Gladkikh 603fd08315 Splunk Logging Driver: formats and verifyconnection
`--log-opt splunk-format=inline|json|raw` allows to change how logging
driver sends data to Splunk, where

`inline` - default value, format used before, message is injected as a
line in JSON payload
`json` - driver will try to parse each line as a JSON object and embed it
inside of the JSON payload
`raw` - driver will send Raw payload instead of JSON, tag and attributes
will be prefixed before the message

`--log-opt splunk-verify-connection=true|false` - allows to skip
verification for Splunk Url

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
2016-08-16 21:45:16 -07:00
Victor Vieux 79aa2b9f6d fix broken link
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-16 21:26:07 -07:00
Zhang Wei 4df77c11e0 bugfix: report "destroy" after all volumes of container destroy
fixes #25766

If a container's AutoRemove is enabled, client will wait until it's
removed after container exits, this is implemented based on "destroy"
event.

Currently an "AutoRemove" container will report "destroy" event to
notify a hanging client to exit before all volumes are removed, this is
wrong, we should wait container until everything is cleaned up.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-08-17 11:02:16 +08:00
Tonis Tiigi 157561e95c Fix retry logic for out of sequence errors
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-16 18:57:01 -07:00
Darren Stahl c58d0358c3 Revendor hcsshim
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-08-16 17:28:49 -07:00
Sebastiaan van Stijn 1a2038c54f Remove unused "size" query parameter for images
Image inspect doesn't have a "size" query parameter.
The client sent this (when doing `docker inspect --size`),
but was unused in the daemon.

This removes the unused parameter, and a test that
didn't actually test anything.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 01:19:07 +02:00
Kanstantsin Shautsou 57db05cb10
Don't confuse with empty body
It fails with any (even empty) json request body.

Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
2016-08-17 02:01:04 +03:00
Tibor Vass 6e70a976ba Merge pull request #25638 from anusha-ragunathan/fix-plugin-tests
Debugging issue #25511
2016-08-16 15:13:31 -07:00
Brian Goff 37302bbb3f Merge pull request #25721 from cpuguy83/revendor_engine-api
revendor engine-api
2016-08-16 17:18:43 -04:00
Mrunal Patel 3c3d2bf852 Allow using --pid=host and --net=host when --userns=host
It is safe to set other namespaces to host when user ns is set to host

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-08-16 14:16:14 -07:00
Charles Smith a7a70433ca edit plugin system doc, fix menu system
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-16 13:36:17 -07:00
Tibor Vass 1225e3e621 Merge pull request #25765 from tonistiigi/publish-add
Add retry checks to TestSwarmPublishAdd
2016-08-16 13:30:31 -07:00
David Dooling f44d78b478 Remove erroneous ENTRYPOINT note
The Dockerfile parser does not subsitute ENV variables in any form of
the ENTRYPOINT command.  Any substitution, if done, is done by the shell
when the command is executed.

Signed-off-by: David Dooling <dooling@gmail.com>
2016-08-16 15:24:41 -05:00
Brian Goff 9ff0ab71a0 Bump docker-py
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-16 14:48:48 -04:00
Brian Goff 6d98e344c7 revendor engine-api
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-16 14:16:12 -04:00
Tonis Tiigi 7bd1c11959 Add retry checks to TestSwarmPublishAdd
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-16 10:39:05 -07:00
Tõnis Tiigi 9a3e7d9e34 Merge pull request #25701 from WeiZhang555/update-conflict-rm-restart
Forbid update restart policy of container with AutoRemove flag
2016-08-16 10:37:45 -07:00
Brian Goff d7753dceb8 Merge pull request #25746 from lixiaobing10051267/masterName
wrong id when testing exists in daemon aufs
2016-08-16 13:00:03 -04:00
Michael Crosby 6e08c4b919 Merge pull request #25672 from estesp/run-docker-in-userns
Allow engine to run inside a user namespace
2016-08-16 09:59:37 -07:00
Tõnis Tiigi 8f8bb8ad4c Merge pull request #25188 from armills/nuke-graph-directory
nuke-graph-directory.sh: Improve subvolume search
2016-08-16 09:47:33 -07:00
Michael Crosby 0c8b0faef8 Merge pull request #25337 from jhorwit2/jah/25332
Add --no-trunc to service/node/stack ps output
2016-08-16 09:25:45 -07:00
Sebastiaan van Stijn 641e1564cf Merge pull request #25757 from eskaaren/create_service_id
Capital D in "ID" returned when creating service
2016-08-16 17:01:22 +02:00
Alexander Morozov 6f06afab2a Merge pull request #25739 from mrjana/vendor
Vendoring libnetwork @82fb373e3eaa4e
2016-08-16 08:01:16 -07:00
Vincent Demeester e48aeb118c Merge pull request #25758 from eskaaren/create_service_annotations
"Annotations" not a parameter
2016-08-16 16:51:15 +02:00
Josh Horwitz 204c4d39d3 Add --no-trunc to service/node/stack ps output
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
2016-08-16 10:19:11 -04:00
Brian Goff 79c1cd87ec Merge pull request #25756 from YuPengZTE/shuold-be--
“ should be "
2016-08-16 09:31:07 -04:00
Eivin Giske Skaaren 69e481af4e "Annotations" not a parameter
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
2016-08-16 15:17:26 +02:00
Brian Goff 754ac49268 Merge pull request #25760 from albers/completion-ls-format
Add bash completion for `docker {network,volume} ls --format`
2016-08-16 09:11:10 -04:00
Harald Albers 5d43a78763 Add bash completion for `docker {network,volume} ls --format`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-16 14:10:28 +02:00
Sebastiaan van Stijn dcdf2b404e Merge pull request #25720 from thaJeztah/add-missing-label-filter-docs
Add missing docs for volume ls filter=label
2016-08-16 13:50:56 +02:00
Eivin Giske Skaaren 9eb2ec799e Capital D in "ID" returned when creating service
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
2016-08-16 13:43:23 +02:00
Sebastiaan van Stijn 0309eeb5dd Merge pull request #25745 from albers/completion-volume-ls-filter-label
Add bash completion for `docker volume ls --filter label`
2016-08-16 13:27:14 +02:00
Sebastiaan van Stijn eb24e9bbd3 Cleanup API docs Markdown formatting and wording
Synchronize formatting between versions, and
update wording to be consistent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-16 13:22:47 +02:00
Sebastiaan van Stijn 1f0a99e86f Merge pull request #25753 from eskaaren/swarm_inspect
Add doc for inspect swarm
2016-08-16 13:19:36 +02:00
Eivin Giske Skaaren c59bc53727 Add doc for inspect swarm
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
2016-08-16 12:49:33 +02:00
YuPengZTE fe081efa92 “ should be "
Full width turn half-width character

Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2016-08-16 18:41:34 +08:00
Sebastiaan van Stijn 348f6529b7 Merge pull request #23808 from AkihiroSuda/formatinfo
add `--format` flag to `docker info`
2016-08-16 12:04:26 +02:00
Vincent Demeester 72a312c07b Merge pull request #25684 from d64/improve-systemd-config-for-raspbian
Improve systemd configuration for Raspbian/Jessie
2016-08-16 10:58:33 +02:00
Vincent Demeester 7524a1d3f2 Merge pull request #25705 from AkihiroSuda/noteRenameCOW
Add a note about the open(2) and rename(2) on AUFS and OverlayFS
2016-08-16 10:52:25 +02:00
Vincent Demeester 9dd8ccc746 Merge pull request #25690 from yongtang/25661-docker-build-detect-tty
Suppress verbose "Sending build context" messages in non tty scenarios
2016-08-16 10:47:11 +02:00
lixiaobing10051267 cdb6c59eda wrong id when testing exists in daemon aufs
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-16 16:42:45 +08:00
Zhang Wei 4754c64ab5 Forbid update restart policy of container with AutoRemove flag
"--restart" and "--rm" are conflict options, if a container is started
with AutoRemove flag, we should forbid the update action for its Restart
Policy.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-08-16 15:36:13 +08:00
Eivin Giske Skaaren 033482d9ff You can force leave swarm
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
2016-08-16 09:32:45 +02:00
Harald Albers 41511f8911 Add bash completion for `docker volume ls --filter label`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-16 09:10:46 +02:00
lixiaobing10051267 68ef256984 Check the return message of docker service inspect
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-16 14:47:13 +08:00
John Howard 3c6f4cd5a6 Merge pull request #25143 from cpuguy83/update_go-check
Add stack dumps from the daemon(s) on test timeout
2016-08-15 22:09:20 -07:00
Akihiro Suda dc38c9a047 add `--format` flag to `docker info`
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-08-16 04:03:52 +00:00