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
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
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
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
20d4e38a31
Add doc for inspect swarm
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com >
Upstream-commit: c59bc537274aa7f4dc9702ea08c349c71a024b39
Component: engine
2016-08-16 12:49:33 +02:00
61ea39768c
“ should be "
...
Full width turn half-width character
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: fe081efa929bab70f72f47ec360cd91a65bd8d46
Component: engine
2016-08-16 18:41:34 +08:00
cd9750292a
Merge pull request #23808 from AkihiroSuda/formatinfo
...
add `--format` flag to `docker info`
Upstream-commit: 348f6529b71502b561aa493e250fd5be248da0d5
Component: engine
2016-08-16 12:04:26 +02:00
900e8ce606
Merge pull request #25684 from d64/improve-systemd-config-for-raspbian
...
Improve systemd configuration for Raspbian/Jessie
Upstream-commit: 72a312c07b101941254f6d2f128520612e42b301
Component: engine
2016-08-16 10:58:33 +02:00
aab3a8354b
Merge pull request #25705 from AkihiroSuda/noteRenameCOW
...
Add a note about the open(2) and rename(2) on AUFS and OverlayFS
Upstream-commit: 7524a1d3f2fa3489d689b1973dfb84e13615d3de
Component: engine
2016-08-16 10:52:25 +02:00
48e956615d
Merge pull request #25690 from yongtang/25661-docker-build-detect-tty
...
Suppress verbose "Sending build context" messages in non tty scenarios
Upstream-commit: 9dd8ccc746a66fe117d37dfcd02ee690d0e1ac02
Component: engine
2016-08-16 10:47:11 +02:00
060a7d7824
wrong id when testing exists in daemon aufs
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: cdb6c59eda4e78d626721a6a38fd305a6d2c50f3
Component: engine
2016-08-16 16:42:45 +08:00
d1bde01a82
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 >
Upstream-commit: 4754c64ab5b5bf5ae6f8a3040606296910e6cb19
Component: engine
2016-08-16 15:36:13 +08:00
a80a4f000b
Add bash completion for docker volume ls --filter label
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 41511f8911e48b1d0404ddc975243f5a6f303fb2
Component: engine
2016-08-16 09:10:46 +02:00
a3a8b4ee81
Merge pull request #25143 from cpuguy83/update_go-check
...
Add stack dumps from the daemon(s) on test timeout
Upstream-commit: 3c6f4cd5a6c0de3d3700ad14bb8f177e8e1198fd
Component: engine
2016-08-15 22:09:20 -07:00
1b140377f0
add --format flag to docker info
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: dc38c9a04705f0a9ad3e007f7869cfb6a8a3a8b8
Component: engine
2016-08-16 04:03:52 +00:00
ca823e9707
Merge pull request #25597 from vieux/check_plugin_manifest_json
...
check plugin manifest is correctly formatted before push
Upstream-commit: f5ef498289a2f2dd80724afbe5a53892690ced53
Component: engine
2016-08-15 19:27:50 -07:00
871f085a91
Add a note about the open(2) and rename(2) on AUFS and OverlayFS
...
Close #25409
Update #10180
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: aab101a770a88cdbde5012dc7eb5b4439cf57192
Component: engine
2016-08-16 02:13:33 +00:00
b791b365ab
Suppress verbose "Sending build context" messages in non tty scenarios
...
This fix tries to address the issue raised in 25661 where verbose
"Sending build context" messages were not suppressed in non tty (e.g. log file)
sencarios.
This fix suppress the "Sending build context" message (other than the last one)
if the output is not a tty. The last update of the "Sending build context"
message is still sent to the output.
This fix has been tested manually:
```
docker build -t tmp . > build.log
```
The output is (only one "Sending build context"):
```
Sending build context to Docker daemon 249.4 MB
Step 1 : FROM busybox
---> 2b8fd9751c4c
Step 2 : RUN echo 'test'
---> Using cache
---> 7db298b6c493
Successfully built 7db298b6c493
```
This fix fixes 25661.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: b4ba575a2882953781616b6bb273419e829fb791
Component: engine
2016-08-15 18:35:05 -07:00
607f7b2a80
Vendoring libnetwork @82fb373e3eaa4e
...
- Fixes a SNAT issue in loadbalancer when multiple networks are involved
- Fixes an issue with SRV query forwarding in DNS
- Fixes a map race
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 56c98226955d98a2ba6a99bffd3a9a80d691e4a7
Component: engine
2016-08-15 17:53:35 -07:00
499e132407
check plugin manifest is correctly formatted before push
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: b47711ae92619f04e070b284f47e203c79640d9e
Component: engine
2016-08-15 17:51:30 -07:00
835c0328ea
Merge pull request #25723 from anusha-ragunathan/plugin-force-rm
...
When handling plugin exit, lookup plugins only during daemon shutdown.
Upstream-commit: 70f843f7ae5a302453f5d64087f366053b1d4e27
Component: engine
2016-08-15 16:30:37 -07:00
9817f32c22
Merge pull request #25676 from tiborvass/fix-rpm-release-script
...
release-rpm: fix bad destination paths for rpms
Upstream-commit: c67cc60713245f101240279a1ff539f96d8942ca
Component: engine
2016-08-15 16:23:25 -07:00
