Yong Tang
26569691e1
Fix issue of WARNING: --size ignored for volume for docker inspect
...
When `docker inspect` is invoked, it is possible to pass a flag of
`-s` for container types to display size information. If `-s` is used
for non-container types then a warning `WARNING: --size ignored for volume`
will show up.
However, currently `WARNING: --size ignored for volume` will show up even
when `-s` is not passed to `docker inspect` for non-container types.
This fix fixes this issue by checking if `-s` has been passed or not (`getSize`).
Also, since image inspect does not support `-s`, `IsSizeSupported` has been changed
to false for images.
This fix is tested manually.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 54976b718feac328609a0323d60f02a28c988f94
Component: engine
2016-09-12 23:08:19 -07:00
Akihiro Suda
0ac3b2e9e4
add current limitation to experimental/checkpoint-restore.md
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: d1c910af383fcce51e57c23b0c848c1f3c3baa8f
Component: engine
2016-09-13 05:14:41 +00:00
Akihiro Suda
3e11675204
fix races in pkg/integration/cmd
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: e17f77ec51f50f9c14c1acd36f1db6f5246b62e0
Component: engine
2016-09-13 04:23:36 +00:00
Zhang Wei
6e795d6e5b
Add parallel operation support for pause/unpause
...
Support parallel pause/unpause
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: f1dda4395eb52eaeca8f9a1c76c2e2c3e6532490
Component: engine
2016-09-13 11:01:28 +08:00
Zhang Wei
a92bf719a1
Enhancement: allow parallel stop
...
Stop multiple containers in parallel to speed up stop process, allow
maximum 50 parallel stops.
Signed-off-by: Abhinav Dahiya <abhinavdtu2012@gmail.com >
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 2155b46915a4df821405d26f576d9fae9fa5178e
Component: engine
2016-09-13 10:50:55 +08:00
lixiaobing10051267
7315cb0e38
fix logruns.Warnf while daemon.networkOptions fails
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 56916b5e8d8a22bc9590d28b9b752a2db4821441
Component: engine
2016-09-13 09:17:39 +08:00
Justin Cormack
3fe1e84cec
Merge pull request #26496 from riyazdf/trust-sandbox-fix
...
Use latest version of notary server in trust sandbox docs
Upstream-commit: 6fafd07282f950799613c2ffc8eac6ff86d48206
Component: engine
2016-09-12 23:56:41 +01:00
Tõnis Tiigi
5363845025
Merge pull request #26499 from LK4D4/health_containerd
...
libcontainerd: use healthcheck to track containerd conn
Upstream-commit: 6a50b673eb1aed482700b38b131eff61449ed306
Component: engine
2016-09-12 15:52:48 -07:00
Alexander Morozov
9ad17e2570
Merge pull request #26461 from crosbymichael/term-exec
...
Add TERM env var to exec
Upstream-commit: 036a8f77b066c8c72e395fc78b08d34c934f9c21
Component: engine
2016-09-12 14:57:37 -07:00
Stephen Day
28ced8e507
issues: re-order issue template for more clarity
...
Triaging issues has become a little challenging since the meat
of the information is below a large amount of unstructured
command line output. These changes add a description and move
the reproduction and expected/received results above the
unstructured output.
This should help for initial triaging, as well as self-triaging.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: be3bc483c684be2b5e84914695372aa1b5054ada
Component: engine
2016-09-12 14:34:00 -07:00
Alexander Morozov
99577ad8e2
libcontainerd: use healthcheck to track containerd conn
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: e4ddcb37c1326e8eef7abbcc84effb016c7a3336
Component: engine
2016-09-12 14:22:38 -07:00
Sebastiaan van Stijn
eef9bfcd51
Merge pull request #26488 from vdemeester/26450-add-client-package-readme
...
Add a README to the client's package…
Upstream-commit: 6edf09cf5821aa947d9d52e21d72b065184fc421
Component: engine
2016-09-12 22:56:32 +02:00
Tonis Tiigi
57ee443d45
Fix already loaded detection for frozen images
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ed747e5a9e48c9e4b574895a5aab0e5daab670d1
Component: engine
2016-09-12 12:55:26 -07:00
Sebastiaan van Stijn
6b60b412a6
Merge pull request #26460 from icecrime/update_issue_triage
...
Update issue labels
Upstream-commit: 23d5b3be9b244aa3a175498a2a464e560a824603
Component: engine
2016-09-12 20:35:59 +02:00
Anusha Ragunathan
fe55b3f380
Merge pull request #25794 from chenchun/timeout
...
Add default timeout to pkg/plugins/client
Upstream-commit: a4d1365bce140df239746b436b6e7c6d4cc54cc3
Component: engine
2016-09-12 11:27:36 -07:00
Christy Perez
06d71bc71f
Always check err before http status
...
A test failed expecting 200, but received -1, which is an err rc,
not an HTTP status code, so move these checks up.
Also log the output an not just check for a nil err.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: 3dea5dbb9acb2699569c5aaf3737d58793152b3c
Component: engine
2016-09-12 12:45:08 -05:00
Riyaz Faizullabhoy
7d2bc2d40d
Use latest version of notary server in trust sandbox docs
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 40f823ccd8ce0c07a27a287f665b4cc0c0084569
Component: engine
2016-09-12 09:42:12 -07:00
Michael Crosby
ace1c458e2
Add TERM env var to exec
...
When the `-t` flag is passed on exec make sure to add the TERM env var
to mirror the expected configuration from run.
Fixes #9299
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 4633f15f13d51530de2438c298a1084c55e4fedf
Component: engine
2016-09-12 09:20:27 -07:00
Arnaud Porterie (icecrime)
1f6a545125
Update issue labels
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 19f0feadd6405176f7cbe94e0ad4b9dc1965da3e
Component: engine
2016-09-12 08:56:04 -07:00
Brian Goff
91d4a22ad9
Merge pull request #26103 from sakeven/fix-validate-build-arg
...
validate build-arg
Upstream-commit: e5544fbb0df01e679822352f49adc5c327ca6656
Component: engine
2016-09-12 09:15:58 -04:00
Antonio Murdaca
61ecf7906c
Merge pull request #26456 from dnephin/move_cli_command_registry
...
Remove registry/auth helper methods from the DockerCLI object
Upstream-commit: e8b9f38c7e2e249084c78c81f136c6d22432af6f
Component: engine
2016-09-12 15:11:04 +02:00
Brian Goff
23e3dc0dcd
Merge pull request #26472 from yongtang/09112016-docker-build-step-0
...
Fix documentation for `Step 0` to `Step 1` in `docker build`
Upstream-commit: e41839e8a154f1336b3a995dba3f5912dde7e0fe
Component: engine
2016-09-12 09:08:35 -04:00
Vincent Demeester
71716dd310
Merge pull request #26483 from miaoyq/optimized-debug-print-in-devicemapper
...
Optimized debug print in the 'deviceset.go'
Upstream-commit: ab2c9b373dbe0aee8441821a0e14bd66a58ba612
Component: engine
2016-09-12 15:08:12 +02:00
Brian Goff
0b4dde90a0
Merge pull request #26301 from albers/completion-service-groups
...
Add bash completion for `service {create,update} --group-{add,rm}`
Upstream-commit: 5ada5f129f8c845c11daf8167a92c4c92d2b917c
Component: engine
2016-09-12 09:05:49 -04:00
yuexiao-wang
4e9a7b27fc
update option for docker commands
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 7084aa24c77bde6ed46b2a0b727d049b86ecffec
Component: engine
2016-09-12 19:10:45 +08:00
sakeven
c169c364de
validate build-arg
...
Signed-off-by: sakeven <jc5930@sina.cn >
Upstream-commit: 5426510bea290a8eff3842fdc32240ad33cc0ef1
Component: engine
2016-09-12 18:02:21 +08:00
Vincent Demeester
be3b58071a
Add a README to the client's package…
...
… taken from the old engine-api project.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a00106f9a5cf58cced011c93e98fbe1d7f65c4e7
Component: engine
2016-09-12 11:41:11 +02:00
Akihiro Suda
06f3b31b69
test: fix trivial code convention noncompliance
...
daemon/events/testutils: rename eventstestutils to testutils
volume/testutils: rename volumetestutils to testutils
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: e03cc68e3adb8aa584ed7db3cd70084fac0a2c4f
Component: engine
2016-09-12 07:36:52 +00:00
Yanqiang Miao
467aa61392
Optimized debug print in the 'deviceset.go'
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 664ad19486b55a529ba2ba53b7d432b03dc5384a
Component: engine
2016-09-12 15:34:17 +08:00
Chun Chen
9a4ddab230
Add default timeout to pkg/plugins/client
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: 0699b00d26a60f4a8447572b34c4aad1ce73d2e1
Component: engine
2016-09-12 10:39:32 +08:00
Sven Dowideit
ec2041215e
Merge pull request #26306 from deployable/patch-1
...
Remote API documentation consistancy
Upstream-commit: 2cce7bf33a1af566670ec0fb2deeff8056b2798d
Component: engine
2016-09-12 10:52:30 +10:00
Sven Dowideit
4472545a05
Merge pull request #26458 from sfsmithcha/fix_vip_diagram
...
updates swarm overlay network diagram
Upstream-commit: ae4582dc28ba33f80f17e2cf47e62e464aac7ec5
Component: engine
2016-09-12 10:11:08 +10:00
Yong Tang
70a2fe1d7b
Fix documentation for Step 0 to Step 1 in docker build
...
The indexing of steps in the output of `docker build` starts with `Step 1`.
However, there are several places in the docs that start with `Step 0`.
This fix addresses the issue and changes `Step 0` to `Step 1` (and subsequent steps).
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 256dbe4b752ba1fde88e6fad76e3a6b08e4a8816
Component: engine
2016-09-11 10:52:40 -07:00
Madhu Venugopal
63c413223c
Merge pull request #26448 from michael-holzheu/PR-libnetwork-bump-to-fix-s390x-ci
...
Vendor libnetwork @51d88e9ae63f
Upstream-commit: 130db0a4894abea39f6e9503711804d2807628bd
Component: engine
2016-09-10 06:00:32 -07:00
Vincent Demeester
c47747e33c
Merge pull request #26426 from sfsmithcha/carry_pry_25414
...
Carry pr 25414
Upstream-commit: e6f76800f5880652382a6f9180bfdefe6aaad577
Component: engine
2016-09-10 11:50:28 +02:00
Vincent Demeester
7e3f0fe810
Merge pull request #26303 from yongtang/26300-docker-images-3-fractional-digits
...
Restrict size to 2 fractional digits for `docker images`
Upstream-commit: 4c3f2e7c376c83593188f6548652e9261209c908
Component: engine
2016-09-10 11:32:45 +02:00
Matt Hoyle
f9b7ffdb90
Keep headings consistant in API documentation
...
The "Stream details" sections are currently a part of the Status codes list.
This change moves them out to the same level as other surrounding sections.
Use () for a paramaters
Remove query param from end point heading
Signed-off-by: Matt Hoyle <matt@deployable.co >
Upstream-commit: e0a552504e64192946c86d3bdd517ae7b3af348f
Component: engine
2016-09-10 12:27:41 +10:00
Brian Goff
c54b5bf8c4
Merge pull request #26457 from aboch/auto
...
Add fallback to resolveSystemAddr() in linux
Upstream-commit: ebae43efc2c1a13f0ff9b46ab568ba758e1a9b66
Component: engine
2016-09-09 20:46:29 -04:00
Charles Smith
0b9d5f508c
carries and closes 25414
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: e7e85c7e067167f6ed14866b66afa461d2de32ba
Component: engine
2016-09-09 15:57:53 -07:00
Charles Smith
c4f625455b
updates swarm overlay network diagram
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 48f3aa7805fc935d1c07f9c697edcb6b274252da
Component: engine
2016-09-09 15:18:53 -07:00
Alessandro Boch
52c85142d9
Add fallback to resolveSystemAddr() in linux
...
- So that swarm init will still work w/o specifying the advertise
address when the daemon is running inside a container
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: c0b24c600e30656144522f85b053f015525022da
Component: engine
2016-09-09 13:27:57 -07:00
Daniel Nephin
be2034fe8c
Remove remaining registry methods from DockerCLI.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 1dd46e06444d1a0c73fc88dfccec4ae0b7f10bf6
Component: engine
2016-09-09 15:50:01 -04:00
Daniel Nephin
4d7122f63b
Remove cli/command/credentials
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e05fa5de480b7bf4c16df1624f85ecf96a42b3f7
Component: engine
2016-09-09 15:50:01 -04:00
Daniel Nephin
bfc42c3a59
Remove RetrieveAuthConfigs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5d335fbda7d32f06c8b3080a79018b9585cb83f1
Component: engine
2016-09-09 15:50:01 -04:00
John Howard
e66566fbee
Windows: Fix regression pulling linux images
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8437d0a3298abf8bf3632a2764b945956ece422f
Component: engine
2016-09-09 11:40:34 -07:00
Charles Smith
5ae8996c81
add swarm mode terms to the glossary
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 498f18de26cb8142323c64683699d9e6f10946ea
Component: engine
2016-09-09 11:18:30 -07:00
Phil Estes
32b3a84313
Merge pull request #22049 from boucher/docker-checkpoint-restore
...
Implement containerd API for checkpoints
Upstream-commit: cf58eb437c4229e876f2d952a228b603a074e584
Component: engine
2016-09-09 13:36:55 -04:00
Phil Estes
c9069cbf6e
Remove --read-only restriction when user ns enabled
...
The restriction is no longer necessary given changes at the runc layer
related to mount options of the rootfs. Also cleaned up the docs on
restrictions left for userns enabled mode. Re-enabled tests related to
--read-only when testing a userns-enabled daemon in integration-cli.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 6062ae5742e49ec1a79073c327f3d1343c218a12
Component: engine
2016-09-09 13:23:41 -04:00
root
6bdcfc529e
Vendor libnetwork @51d88e9ae63f
...
- Fixes #26440
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
Upstream-commit: 7d8048de06d6074dc83c973a48c1e1a1b60704b6
Component: engine
2016-09-09 18:57:15 +02:00
Daniel Nephin
fcbd8b4fb4
Merge pull request #26443 from dnephin/move_trust_client
...
Move image trust related cli methods into the image package
Upstream-commit: 81090c945515066681ac7fd195660e8a28247007
Component: engine
2016-09-09 12:29:28 -04:00