docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Code Activity
26,653 Commits 12 Branches 297 Tags
f1f995a05271dc4fe02607a3e83dbdfb4b210d54
Commit Graph

24990 Commits

Author SHA1 Message Date
Tõnis Tiigi
f1f995a052 Merge pull request #25839 from cpuguy83/add_comments 
Add requested comments about old buggy behavior
Upstream-commit: 923053d1edac552a8d48cbb293c4ec935a93348b
Component: engine
 2016-08-18 10:31:37 -07:00
Sebastiaan van Stijn
9ad4bec0bc Merge pull request #25743 from lixiaobing10051267/masterInspect 
Check the return message of docker service inspect
Upstream-commit: 6fa69d2d0610320cce61517eca6e4471f5381561
Component: engine
 2016-08-18 19:25:08 +02:00
Sebastiaan van Stijn
9c61498be3 Merge pull request #25726 from vieux/new_plugin_system_doc 
adding some documentation about the new plugin system
Upstream-commit: 88a6a7763b789a35fff9df4e52e48ca99afd3c08
Component: engine
 2016-08-18 17:20:09 +02:00
Sebastiaan van Stijn
c48cb27659 Merge pull request #25792 from lixiaobing10051267/masterSwarmLeave 
Specify woker node for docker swarm leave command
Upstream-commit: 90308fd78315412c30da90217ee14515de4fbf8a
Component: engine
 2016-08-18 17:08:41 +02:00
Sebastiaan van Stijn
9ebd97c86d Merge pull request #25812 from johananl/patch-1 
Update device-mapper-driver.md
Upstream-commit: 840a1982803425d67d9c29acbed0d16ecaa6e4ed
Component: engine
 2016-08-18 17:08:14 +02:00
Brian Goff
2c45777add Add requested comments about old buggy behavior 
Address comment: 246d1eb58e (r75242138)

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c7075bd14949bae1ec938118ee96e4f1c9830b41
Component: engine
 2016-08-18 10:07:22 -04:00
Vincent Demeester
02f084e00a Merge pull request #25815 from justincormack/capdoc 
Split list of capabilities into those added by default and those not
Upstream-commit: d854c4fcc6255330693eee67b655606e92b11544
Component: engine
 2016-08-18 15:26:59 +02:00
Vincent Demeester
46a42da7e0 Merge pull request #25785 from WeiZhang555/fix-flaky-external-volume-driver 
bugfix: report "destroy" after all volumes of container destroy
Upstream-commit: 3cebff8b869d2720b12618ef5bff22fa4f0fd4a6
Component: engine
 2016-08-18 09:58:54 +02:00
Tibor Vass
742fa26537 Merge pull request #25825 from cpuguy83/25821_fix_nil_opts 
Fix volume not working after daemon restart
Upstream-commit: 1b954973cce64e42b440ff63fa998593f3e499e9
Component: engine
 2016-08-17 20:15:34 -07:00
lixiaobing10051267
a87ab137b8 Specify woker node for docker swarm leave command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: fd660e21bf6568c3f98424bdff3b9672cd2a3ef8
Component: engine
 2016-08-18 09:35:11 +08:00
Brian Goff
69cd6761bb Fix volume not working after daemon restart 
When the daemon is started, it looks at all the volumes and checks to
see if any of them have mount options persisted to disk, and loads them
from disk if it does.

In some cases a volume will be created with an empty map causing the
options file to be persisted and volume options set to a non-nil value
on daemon restart... this causes problems later when the driver checks
for a non-nil value to determine if it should try and mount with the
persisted volume options.

Ensures 2 things:

1. Instead of only checking nilness for the opts map, use `len` to make
sure it is not an empty map, which we don't really need to persit.

2. An empty (or nulled) opts.json will not inadvertnatly set volume
options on daemon restart.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 246d1eb58e807f2cf2d2b387e267dcfa228f96a8
Component: engine
 2016-08-17 20:36:17 -04:00
John Howard
f5ce997d75 Fix minor typo 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d56c2ea9edf0a6f5abfb5be8d241ecf8375054ff
Component: engine
 2016-08-17 16:10:01 -07:00
Justin Cormack
92992ea84a Merge pull request #25801 from thaJeztah/improve-volume-validation-message 
improve error message for volume names that are too short
Upstream-commit: b0b3249bc2265dcb7a290501dcc93c65f9265848
Component: engine
 2016-08-17 23:33:08 +01:00
Alexander Morozov
02f0dc9ea5 Merge pull request #25808 from justincormack/parallel-tests 
Run seccomp tests in series not parallel
Upstream-commit: a1fece68211826386612ba16526543ba052a46dd
Component: engine
 2016-08-17 14:50:24 -07:00
Justin Cormack
3a9b1e9ecd Split list of capabilities into those added by default and those not 
The documentation was a bit unhelpful as to what are the default
capabilities, so split.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: bf7a3f010443ecd614baf0450c3193b1f5e52bc2
Component: engine
 2016-08-17 21:16:54 +01:00
Brian Goff
f3a1d45b88 Merge pull request #25809 from justincormack/patricia 
Update go-patricia to 2.2.6
Upstream-commit: d8e12f87559ae21327820b3cd5abb0249ab47519
Component: engine
 2016-08-17 15:25:17 -04:00
Johanan Lieberman
3497960ec5 Update device-mapper-driver.md 
Signed-off-by: Johanan Lieberman <johanan.lieberman@gmail.com>
Upstream-commit: 086542a687235b0c3c8a6985755b918e2e93fcbc
Component: engine
 2016-08-17 21:58:30 +03:00
Justin Cormack
891863d8ab Update go-patricia to 2.2.6 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: d16f96262e25487f84d6217bf4c224280a84d89f
Component: engine
 2016-08-17 19:02:32 +01:00
Justin Cormack
f6d6194ce9 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>
Upstream-commit: 84ec04306caac458c237881b1869fb2b077fced4
Component: engine
 2016-08-17 18:48:06 +01:00
Michael Crosby
6c683fac48 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>
Upstream-commit: 041e5a21dc0a8856448e3a9ad91e8535b8a7d00d
Component: engine
 2016-08-17 09:38:34 -07:00
Sebastiaan van Stijn
3da3f4e31d Merge pull request #25789 from sdurrheimer/zsh-completion-network-volume-ls-format 
Add zsh completion for 'docker {network,volume} ls --format'
Upstream-commit: 2ae49a088718f675ec11c387072fe6de8b22f0c7
Component: engine
 2016-08-17 16:51:51 +02:00
Sebastiaan van Stijn
1a062ddf1e improve error message for volume names that are too short 
this improves the error message if a user tries to
create a volume with a single-character name:

Before this change:

    docker volume create --name a
    Error response from daemon: create a: "a" includes invalid characters for a local volume name, only "[a-zA-Z0-9][a-zA-Z0-9_.-]" are allowed

After this change:

    docker volume create --name a
    Error response from daemon: create a: volume name is too short, names should be at least two alphanumeric characters

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8d5a615045f691536baf8a4cb69e0c505bc1cad2
Component: engine
 2016-08-17 16:40:24 +02:00
Sebastiaan van Stijn
703353742f Add missing docs about binary remote contexts 
This feature was added in docker 1.8, through
7491f9a9c11ad3fd3b587fa6f7e53b297b3b88c7.

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;
561bfb268de3c674b04d48895b7e46ae890ef795

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a5ba032c7421ef7a429e780d12d0f604a045258a
Component: engine
 2016-08-17 16:15:59 +02:00
Phil Estes
a410528fcc Merge pull request #25771 from mrunalp/allow_host_ns_with_user 
Allow using --pid=host and --net=host when --userns=host
Upstream-commit: 3473980a295067c8a265feff83be2ee306afaceb
Component: engine
 2016-08-17 09:57:30 -04:00
Sebastiaan van Stijn
61a857e388 Merge pull request #25788 from sdurrheimer/zsh-completion-volumes-ls-filter-label 
Add zsh completion for 'docker volume ls --filter label'
Upstream-commit: 2c224e4fc09518d33780d818cf74026f6aa32744
Component: engine
 2016-08-17 11:11:27 +02:00
Sebastiaan van Stijn
6964d60fa7 Merge pull request #25634 from darrenstahlmsft/RevendorHcsshim 
Revendor hcsshim to v0.4.1
Upstream-commit: 5e2a5199570169934fb80819356e5afb8bc6e8c1
Component: engine
 2016-08-17 10:50:00 +02:00
Sebastiaan van Stijn
e997af8b70 Merge pull request #25704 from thaJeztah/cleanup-api-markdown 
Cleanup API docs Markdown formatting and wording
Upstream-commit: 45cb33e65ca5bb247e2e9f425b4441ad6a08aa51
Component: engine
 2016-08-17 10:39:45 +02:00
Vincent Demeester
2943f3420d Merge pull request #25751 from yuexiao-wang/clean-docs 
Remove mess words in installation doc
Upstream-commit: bbd5396955a8c36b9f208d64fe580b769c1686f5
Component: engine
 2016-08-17 09:59:36 +02:00
Vincent Demeester
d8621fcdfc Merge pull request #25783 from tonistiigi/fix-retry 
Fix retry logic for out of sequence errors
Upstream-commit: 10a3a269a0c61bd63d6c694975bbe37aaf66672b
Component: engine
 2016-08-17 09:56:06 +02:00
Vincent Demeester
f9c2dcf3d2 Merge pull request #25778 from KostyaSha/patch-5 
Don't confuse with sub-node
Upstream-commit: 32aad511f82cd2a082fb344d580cc3396a530e3f
Component: engine
 2016-08-17 09:50:22 +02:00
yuexiao-wang
f07d519e90 remove mess words in installation doc 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: f8d5b880722bcc87113a08cbb2069b6311b89f39
Component: engine
 2016-08-17 15:43:52 +08:00
Steve Durrheimer
f0e6c337db Add zsh completion for 'docker {network,volume} ls --format' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 25009687be204db821c962e341ca91e7b8324c42
Component: engine
 2016-08-17 08:21:15 +02:00
Steve Durrheimer
5a61089695 Add zsh completion for 'docker volume ls --filter label' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d1870019a02e3d74e3ad173e3cb73dbe5574e831
Component: engine
 2016-08-17 08:15:26 +02:00
Victor Vieux
80c9d996e6 fix broken link 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 79aa2b9f6da802ee1380c22c3afc8c0be7c493ce
Component: engine
 2016-08-16 21:26:07 -07:00
Zhang Wei
bf5e17ead0 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>
Upstream-commit: 4df77c11e065bf96b04fc0328a7e7600a2e64937
Component: engine
 2016-08-17 11:02:16 +08:00
Tonis Tiigi
449509c833 Fix retry logic for out of sequence errors 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 157561e95ccaef883fe106a38741acb3d493879f
Component: engine
 2016-08-16 18:57:01 -07:00
Darren Stahl
97adc78725 Revendor hcsshim 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: c58d0358c359e391707698b12850524137ef56ae
Component: engine
 2016-08-16 17:28:49 -07:00
Sebastiaan van Stijn
5bc44a5476 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>
Upstream-commit: 1a2038c54faedeb6d7adf6ddaf0e73f8ce4920d4
Component: engine
 2016-08-17 01:19:07 +02:00
Kanstantsin Shautsou
294f10b578 Don't confuse with empty body 
It fails with any (even empty) json request body.

Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Upstream-commit: 57db05cb1031f6a01e1568ceb16434e5809aef81
Component: engine
 2016-08-17 02:01:04 +03:00
Tibor Vass
5c4fc1cbb0 Merge pull request #25638 from anusha-ragunathan/fix-plugin-tests 
Debugging issue #25511
Upstream-commit: 6e70a976ba98c24ed4027f2b8e5890718be57344
Component: engine
 2016-08-16 15:13:31 -07:00
Brian Goff
a0933c7d27 Merge pull request #25721 from cpuguy83/revendor_engine-api 
revendor engine-api
Upstream-commit: 37302bbb3f4889e9de2a95d5ea018acdab9e4447
Component: engine
 2016-08-16 17:18:43 -04:00
Mrunal Patel
d2ee183037 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>
Upstream-commit: 3c3d2bf85229f9ca4879a24072762477e96c4344
Component: engine
 2016-08-16 14:16:14 -07:00
Charles Smith
ec5f7ff759 edit plugin system doc, fix menu system 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: a7a70433cabe5eb210ef81ff61f953ab9d9e332d
Component: engine
 2016-08-16 13:36:17 -07:00
Tibor Vass
376bb6885c Merge pull request #25765 from tonistiigi/publish-add 
Add retry checks to TestSwarmPublishAdd
Upstream-commit: 1225e3e6216b0388ed5f3985d7263efdb6e22043
Component: engine
 2016-08-16 13:30:31 -07:00
Brian Goff
5882c6376d Bump docker-py 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9ff0ab71a076d9147d2973c1425044f7c5c9b426
Component: engine
 2016-08-16 14:48:48 -04:00
Brian Goff
3dcc0abf19 revendor engine-api 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 6d98e344c7702a8a713cb9e02a19d83a79d3f930
Component: engine
 2016-08-16 14:16:12 -04:00
Tonis Tiigi
918ec07087 Add retry checks to TestSwarmPublishAdd 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7bd1c1195998c10c732ccfa67c568e634d58166e
Component: engine
 2016-08-16 10:39:05 -07:00
Tõnis Tiigi
a413b2d6cd Merge pull request #25701 from WeiZhang555/update-conflict-rm-restart 
Forbid update restart policy of container with AutoRemove flag
Upstream-commit: 9a3e7d9e343938218aac8217c4b8ba4c21b841c4
Component: engine
 2016-08-16 10:37:45 -07:00
Brian Goff
0f2f3d0378 Merge pull request #25746 from lixiaobing10051267/masterName 
wrong id when testing exists in daemon aufs
Upstream-commit: d7753dceb814e92c20a067df51fd231fe2d0fda9
Component: engine
 2016-08-16 13:00:03 -04:00
Michael Crosby
444c7f1201 Merge pull request #25672 from estesp/run-docker-in-userns 
Allow engine to run inside a user namespace
Upstream-commit: 6e08c4b919aaca39e19052a53026fc90789ecbb3
Component: engine
 2016-08-16 09:59:37 -07:00