beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
26631 commits 14 branches 412 tags 338 MiB
Commit graph

26631 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Morozov
a1fece6821 Merge pull request #25808 from justincormack/parallel-tests 
Run seccomp tests in series not parallel
 2016-08-17 14:50:24 -07:00
Brian Goff
d8e12f8755 Merge pull request #25809 from justincormack/patricia 
Update go-patricia to 2.2.6
 2016-08-17 15:25:17 -04:00
Alexander Morozov
2d93186e00 Merge pull request #25805 from crosbymichael/oci-import-paths 
Replace old oci specs import with runtime-specs
 2016-08-17 11:07:13 -07:00
Justin Cormack
d16f96262e Update go-patricia to 2.2.6 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-17 19:02:32 +01:00
Justin Cormack
84ec04306c Run seccomp tests in series not parallel 
Fix #24803 as this had been failing sometimes.

As the parallel tests are probably genuine failures, and
had already been cut down, I will re-create these specifically
as a parallel execution test with no seccomp to make the
cause clearer.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-17 18:48:06 +01:00
Michael Crosby
041e5a21dc Replace old oci specs import with runtime-specs 
Fixes #25804

The upstream repo changed the import paths.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-08-17 09:38:34 -07:00
Sebastiaan van Stijn
2ae49a0887 Merge pull request #25789 from sdurrheimer/zsh-completion-network-volume-ls-format 
Add zsh completion for 'docker {network,volume} ls --format'
 2016-08-17 16:51:51 +02:00
Sebastiaan van Stijn
b4abe38d43 Merge pull request #25709 from thaJeztah/fix-missing-docs-for-binary-remote-context 
Add missing docs about binary remote contexts
 2016-08-17 16:43:35 +02:00
Sebastiaan van Stijn
a5ba032c74 Add missing docs about binary remote contexts 
This feature was added in docker 1.8, through
7491f9a9c1.

However, the API docs ended up in the wrong
API version (1.19 instead of 1.20), so were
never included in future API docs.

Also, the CLI docs got lost during splitting
up the cli.md docs into separate files;
561bfb268d

This moves the API docs to the correct
versions, and restores the CLI documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-17 16:15:59 +02:00
Phil Estes
3473980a29 Merge pull request #25771 from mrunalp/allow_host_ns_with_user 
Allow using --pid=host and --net=host when --userns=host
 2016-08-17 09:57:30 -04:00
Sebastiaan van Stijn
2c224e4fc0 Merge pull request #25788 from sdurrheimer/zsh-completion-volumes-ls-filter-label 
Add zsh completion for 'docker volume ls --filter label'
 2016-08-17 11:11:27 +02:00
Sebastiaan van Stijn
5e2a519957 Merge pull request #25634 from darrenstahlmsft/RevendorHcsshim 
Revendor hcsshim to v0.4.1
 2016-08-17 10:50:00 +02:00
Sebastiaan van Stijn
45cb33e65c Merge pull request #25704 from thaJeztah/cleanup-api-markdown 
Cleanup API docs Markdown formatting and wording
 2016-08-17 10:39:45 +02:00
Vincent Demeester
bbd5396955 Merge pull request #25751 from yuexiao-wang/clean-docs 
Remove mess words in installation doc
 2016-08-17 09:59:36 +02:00
Vincent Demeester
10a3a269a0 Merge pull request #25783 from tonistiigi/fix-retry 
Fix retry logic for out of sequence errors
 2016-08-17 09:56:06 +02:00
Vincent Demeester
32aad511f8 Merge pull request #25778 from KostyaSha/patch-5 
Don't confuse with sub-node
 2016-08-17 09:50:22 +02:00
yuexiao-wang
f8d5b88072 remove mess words in installation doc 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-17 15:43:52 +08:00
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
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
Tibor Vass
1225e3e621 Merge pull request #25765 from tonistiigi/publish-add 
Add retry checks to TestSwarmPublishAdd
 2016-08-16 13:30:31 -07: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