a8b63c7173
clean up the run.md in reference
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: dd02815a2673794cd94f3225c5517d9f30d09d56
Component: engine
2016-08-18 10:21:41 +08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
97adc78725
Revendor hcsshim
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: c58d0358c359e391707698b12850524137ef56ae
Component: engine
2016-08-16 17:28:49 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
a42a4868ac
Merge pull request #25188 from armills/nuke-graph-directory
...
nuke-graph-directory.sh: Improve subvolume search
Upstream-commit: 8f8bb8ad4c20c8891f26b6a30dcdcfe8edbdaa8e
Component: engine
2016-08-16 09:47:33 -07:00
06f36cfa80
Merge pull request #25337 from jhorwit2/jah/25332
...
Add --no-trunc to service/node/stack ps output
Upstream-commit: 0c8b0faef8dfb2aa97575bae8afa152e54e63492
Component: engine
2016-08-16 09:25:45 -07:00
3e85f88396
Merge pull request #25757 from eskaaren/create_service_id
...
Capital D in "ID" returned when creating service
Upstream-commit: 641e1564cfeb3f94f68f3c43a353df10331afecf
Component: engine
2016-08-16 17:01:22 +02:00
a7130a656e
Merge pull request #25739 from mrjana/vendor
...
Vendoring libnetwork @82fb373e3eaa4e
Upstream-commit: 6f06afab2a37924be5b9ee5712847062b2037337
Component: engine
2016-08-16 08:01:16 -07:00
b99343eade
Merge pull request #25758 from eskaaren/create_service_annotations
...
"Annotations" not a parameter
Upstream-commit: e48aeb118c088f63c0708f953d84cd9041920e0f
Component: engine
2016-08-16 16:51:15 +02:00
cff5a79975
Add --no-trunc to service/node/stack ps output
...
Signed-off-by: Josh Horwitz <horwitzja@gmail.com >
Upstream-commit: 204c4d39d3241cff1b44f438b99bd0d6484e7b48
Component: engine
2016-08-16 10:19:11 -04:00
5d91ad733a
Merge pull request #25756 from YuPengZTE/shuold-be--
...
“ should be "
Upstream-commit: 79c1cd87ec74aa5ca71ceb52e12ab2f15efd8b24
Component: engine
2016-08-16 09:31:07 -04:00
eefe7f0f5d
"Annotations" not a parameter
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com >
Upstream-commit: 69e481af4e1fec65629c6ea4eb74fc58f5abc932
Component: engine
2016-08-16 15:17:26 +02:00
f4bd85975e
Merge pull request #25760 from albers/completion-ls-format
...
Add bash completion for `docker {network,volume} ls --format`
Upstream-commit: 754ac492683df604ea30881acc52d4f50606d68a
Component: engine
2016-08-16 09:11:10 -04:00
7494d4ad1a
Add bash completion for docker {network,volume} ls --format
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5d43a78763d4cb435b080d607c4605591dfea67d
Component: engine
2016-08-16 14:10:28 +02:00
4a7e8b4b54
Merge pull request #25720 from thaJeztah/add-missing-label-filter-docs
...
Add missing docs for volume ls filter=label
Upstream-commit: dcdf2b404ef1859500c169c0a2fdb1d78add3d58
Component: engine
2016-08-16 13:50:56 +02:00
cf3d39b364
Capital D in "ID" returned when creating service
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com >
Upstream-commit: 9eb2ec799eb37210dee5183ace375e480bbfd8aa
Component: engine
2016-08-16 13:43:23 +02:00
48966e7c86
Merge pull request #25745 from albers/completion-volume-ls-filter-label
...
Add bash completion for `docker volume ls --filter label`
Upstream-commit: 0309eeb5ddd9733daa18ef07f7eea0dc3c53626e
Component: engine
2016-08-16 13:27:14 +02:00
3b1b49d31b
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 >
Upstream-commit: eb24e9bbd312b0d7392e8012b757e7c9022c9add
Component: engine
2016-08-16 13:22:47 +02:00
c2797cb474
Merge pull request #25753 from eskaaren/swarm_inspect
...
Add doc for inspect swarm
Upstream-commit: 1f0a99e86f78f5c5f076c1dcd10ad329ea8ee737
Component: engine
2016-08-16 13:19:36 +02:00
