73a09fcbca
Merge pull request #31194 from albers/completion-volume-aliases
...
Add support for command aliases to bash completion of `docker volume`
Upstream-commit: c6e102c830716b016ea56056555631112e5348d2
Component: engine
2017-03-06 09:52:41 -08:00
e9ce01080a
Merge pull request #31543 from chawlanikhil24/master
...
Replaced "err" with "nil" & added a comment
Upstream-commit: 3cfc3e30a886aef1a5e767d5b2a9a7b2c156c5f9
Component: engine
2017-03-06 15:11:14 +01:00
efa1df2f92
Merge pull request #31549 from cyphar/TestDaemonCommand-fix
...
cmd: docker: fix TestDaemonCommand
Upstream-commit: 6753b3bef3176fca25c512102c07b720374e3cfb
Component: engine
2017-03-06 15:10:40 +01:00
e7e6e755c3
Merge pull request #31450 from thaJeztah/fix-volume-force-remove
...
do not ignore "volume in use" errors when force-delete
Upstream-commit: 95cb74818a92de99b42c0c10f9ae4710c27357f4
Component: engine
2017-03-06 14:35:46 +01:00
8e858ae994
Fixed the typo in the code
...
Signed-off-by: Nikhil Chawla <chawlanikhil24@gmail.com >
Upstream-commit: 73309aa009702dbcb5ac0c32499c984797ba9f4b
Component: engine
2017-03-06 17:31:04 +05:30
6b811850e3
Merge pull request #31558 from albers/completion-service--rollback
...
Add bash completion for `service create|update --rollback-*`
Upstream-commit: 3fdb0c57efcd7847eedcec8382fa1684bb287964
Component: engine
2017-03-05 22:29:52 -05:00
6d7ce8e47f
Improve bash completion for service create|update --update-failure-action
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 07a5119b1a20706e47b15623eee2f0dc20ed1d4d
Component: engine
2017-03-05 10:42:44 -08:00
8325aab7a8
Add bash completion for service create|update --rollback-*
...
Also remove wrong completion for `docker service create --rollback`
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5a9425c41754f479e27a03495f74f028a2c876b4
Component: engine
2017-03-05 10:41:19 -08:00
b34943b2d7
cmd: docker: fix TestDaemonCommand
...
In more recent versions of Cobra, `--help` parsing is done before
anything else resulting in TestDaemonCommand not actually passing. I'm
actually unsure if this test ever passed since it appears that !daemon
is not being run as part of the test suite.
Signed-off-by: Aleksa Sarai <asarai@suse.de >
Upstream-commit: dd7159060f60ea04007c069df189a29fda2c655f
Component: engine
2017-03-05 15:26:49 +11:00
162bfc910b
Merge pull request #31108 from aaronlehmann/automatic-rollback
...
Automatic service rollback on failure
Upstream-commit: 338565805c31783c63f9bb35d5b24f4c0c5656d3
Component: engine
2017-03-03 18:47:14 -08:00
d82df5d4ba
Implement server-side rollback, for daemon versions that support this
...
Server-side rollback can take advantage of the rollback-specific update
parameters, instead of being treated as a normal update that happens to
go back to a previous version of the spec.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: f9bd8ec8b268581f93095c5a80679f0a8ff498bf
Component: engine
2017-03-03 16:33:34 -08:00
ac66308e6c
Add support for rollback flags
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 3a88a24d23e6eb1ca521cd9ab6e306d4ba1c1464
Component: engine
2017-03-03 16:33:34 -08:00
0c390668f1
Add support for the "rollback" failure action
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: cc9d04647a68cf49e66bf26f10908387b99dae1a
Component: engine
2017-03-03 16:33:34 -08:00
07d28f45ab
Merge pull request #31533 from yongtang/30733-fix
...
Fix error caused by overlapping merge of #30733
Upstream-commit: 94d1a5b366152e5384a4bb925a40bf0a8c554a72
Component: engine
2017-03-03 15:19:00 -08:00
146a801e5a
Fix error caused by overlapping merge of 30733
...
This fix fixes build error caused by overlapping merge of 30733 and 28213.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f2197b679401627610a7efc8adb9ddc27b5af02f
Component: engine
2017-03-03 13:26:00 -08:00
8d9c7cbbe3
Merge pull request #30733 from yongtang/02022017-formatter-header
...
Allow `--format` to use different delim in `table` format
Upstream-commit: 9369acc776be47eb4163ee97153aefa0a4e647a0
Component: engine
2017-03-03 11:25:19 -08:00
2756e96b10
Merge pull request #31522 from vdemeester/fix-clean-in-env
...
Ignore no such container in testEnv.Clean
Upstream-commit: cddb8981cafd9fae410d68c846a93e77e50ba246
Component: engine
2017-03-03 20:24:58 +01:00
b8d452f1fe
Ignore no such container in testEnv.Clean
...
When moving the clean function there, this check was not ported and
generated some errors on the CI. `deleteContainer` now fail if any
error but the clean function won't if "no such container" (because of
some races -_-).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5dd89abdf1ec3e633ce01e74d1c47f8eb02fa31e
Component: engine
2017-03-03 15:57:27 +01:00
47709fd338
Merge pull request #31083 from xulike666/fight-for-readability
...
fix some typos from module contrib to man
Upstream-commit: 57fd478169071b09f0e6657cc1c2568d80c1bed3
Component: engine
2017-03-03 15:13:01 +01:00
d4d27bb5d4
Merge pull request #30725 from aaronlehmann/topology
...
Topology-aware scheduling
Upstream-commit: 3a5a1c3f3d1638c35891ee630ba20eda0bef560f
Component: engine
2017-03-03 15:01:12 +01:00
c09eedcd69
Merge pull request #30265 from allencloud/add-CheckDuplicate-details-and-logic
...
add CheckDuplicate docs and logics in network
Upstream-commit: e1da516598e6f4e8f58964fce62ff13be1d8cc09
Component: engine
2017-03-03 14:18:52 +01:00
18c2eb7969
Merge pull request #31511 from albers/completion-dashes-in-function-names
...
Improve POSIX compatibility of bash completion
Upstream-commit: 10719ab6e459efbf20013f1a730bab7f6b728f2d
Component: engine
2017-03-03 13:15:58 +01:00
1c3e6ffe77
Improve POSIX compatibility of bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 76f4681b569a235f9c1838fbf083fd2b8ec684ef
Component: engine
2017-03-03 10:26:33 +01:00
f3bfd3cf98
Merge pull request #28279 from chchliang/updown
...
--max-concurrent-downloads,--max-concurrent-uploads must great than or equal to 0
Upstream-commit: dc1b0e1b2c8483e0f2eaa28316be01aae6d6ae4a
Component: engine
2017-03-03 10:06:59 +01:00
fa769257a1
Merge pull request #31491 from rawkode/feature/healthchecks-missing-environment
...
Healthchecks should inherit environment
Upstream-commit: f4e82d71a8ec6aa2b03c213be7fb2a2ebd591ca7
Component: engine
2017-03-03 08:36:37 +01:00
f017287691
Merge pull request #31485 from vdemeester/fix-inContainer-detection
...
Fix inContainer detection which CROSSPLATFORM env variable missing
Upstream-commit: 305601bb31b56b8a0b0380131f8ea157aa8dce55
Component: engine
2017-03-03 08:35:59 +01:00
122308775b
Merge pull request #30888 from estesp/moar-manifestlist-debug-output
...
Add debug output to manifest list parsing
Upstream-commit: 91f11437b6d62a753d68a4291fc68ecd0c029ee1
Component: engine
2017-03-03 13:09:38 +09:00
302e2c7325
Merge pull request #31409 from yuexiao-wang/fix-version
...
'docker daemon' deprecation message doesn't use the new version
Upstream-commit: 55b955d9ffc14571fa6b5a1a6369a8be8d053853
Component: engine
2017-03-02 22:02:09 -05:00
31865190c5
'docker daemon' deprecation message doesn't use the new versioning scheme
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 5a9cee7bb57e7da7f2793fbb290498bba0531105
Component: engine
2017-03-03 17:26:49 +08:00
6da6ca3b17
Merge pull request #31496 from vieux/update_deprecation
...
update deprecation dates
Upstream-commit: 0ab40a75521d5cb81daf1bdd2b2442bcde850f6e
Component: engine
2017-03-02 16:03:39 -08:00
6505d8702b
Merge pull request #31478 from cyphar/seccomp-fix-unsupported-build
...
profiles: seccomp: fix !seccomp build
Upstream-commit: 0b9fddb7899cc66543bc357e92111c308d8eb441
Component: engine
2017-03-02 09:23:28 -08:00
da34e724f8
Healthchecks should inherit environment
...
Signed-off-by: David McKay <david@rawkode.com >
Upstream-commit: 647dce9dea4aa56c919365b222e582749f1f7781
Component: engine
2017-03-02 16:23:56 +00:00
1d33c2f300
Fix inContainer detection which CROSSPLATFORM env variable missing
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b985db92a3d60ac5485474145c15d3d0bc5571ff
Component: engine
2017-03-02 14:36:37 +01:00
e7b1686c7a
Merge pull request #31484 from thaJeztah/waves-bye-to-down-under
...
Move Sven to alumni
Upstream-commit: 9bebc635a245a459cf833971ef2ed5fe848c9b39
Component: engine
2017-03-02 23:17:49 +10:00
9bca667283
Move Sven to alumni
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 26537cafbcb4c3ef47c7f32bd86c2f84b095f714
Component: engine
2017-03-02 14:08:52 +01:00
2177711660
Merge pull request #31480 from thaJeztah/carry-31213-update-experimental-index
...
[carry 31213] Update index.md
Upstream-commit: 6361117b59e9f648174980177a018e1506c4ad3b
Component: engine
2017-03-02 12:22:12 +01:00
5c5b34e757
Update index.md
...
Signed-off-by: Wang Jie <wangjie5@chinaskycloud.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e20bbe59e9815d14feec971706eb94160362ed8d
Component: engine
2017-03-02 12:18:55 +01:00
0910a190f6
Merge pull request #31476 from thaJeztah/update-poule-config
...
update poule-config; add Yong to auto-assignment
Upstream-commit: 75483d212476995c8a0155195c5661d29f2f385a
Component: engine
2017-03-02 11:23:44 +01:00
b6c4443434
Merge pull request #31339 from albers/completion-service-ps--only-one-service
...
Bash completion for `docker service ps` completes only one service
Upstream-commit: 3b5d8e6a8d65ab9d32e410b8cf5483e5c2032284
Component: engine
2017-03-02 11:21:17 +01:00
65e5be2b7f
update poule-config; add Yong to auto-assignment
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: da3c711c12e4abce495a247453113086d48bf15d
Component: engine
2017-03-02 11:15:40 +01:00
14211fb6b1
profiles: seccomp: fix !seccomp build
...
Previously building with seccomp disabled would cause build failures
because of a mismatch in the type signatures of DefaultProfile().
Signed-off-by: Aleksa Sarai <asarai@suse.de >
Upstream-commit: a3155743adc80e4ce0c4e84fccad2649d6c14f00
Component: engine
2017-03-02 21:13:17 +11:00
96de508a38
Merge pull request #31356 from coolljt0725/fix_suspend
...
devicemapper: Fix suspend a removed device
Upstream-commit: 3e561e4a845592b1c23cb6d13256694983066712
Component: engine
2017-03-02 10:11:48 +01:00
e7fb7dd3ef
Merge pull request #31472 from fate-grand-order/fixed
...
fix func name "BuildFromContext" in comment
Upstream-commit: 6b615d7638c5dbe9cc5c87c39da5ab9ec618a468
Component: engine
2017-03-02 18:11:04 +09:00
0b5c58f653
fix func name "BuildFromContext" in comment
...
Signed-off-by: Helen Xie <chenjg@harmonycloud.cn >
Upstream-commit: d37df06ebead733a10ebbff2b5e7a45003b6fac6
Component: engine
2017-03-02 17:00:40 +08:00
3ab73605ef
Merge pull request #31460 from vdemeester/integration-clean-in-env-p1
...
Move TearDownTest cleaning to environment package
Upstream-commit: 1a412a04706633ab5274a0ad6bd5c4414324bc9c
Component: engine
2017-03-02 09:51:46 +01:00
ddba854f3e
Merge pull request #31467 from thaJeztah/remove-jekyll-markers
...
remove Jekyll tags from CLI reference
Upstream-commit: 9321a12115466a46013dd2258cd9ad658d303c48
Component: engine
2017-03-02 08:27:12 +01:00
56417c3da5
Merge pull request #30729 from dmcgowan/update-go-connections
...
Update go-connections package
Upstream-commit: d8b0d2b9e9e3d4b2537a2ebbbb8f6187ea755286
Component: engine
2017-03-01 18:24:32 -08:00
7860655b94
--max-concurrent-downloads,--max-concurrent-uploads must great than or equal to 0
...
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn >
Upstream-commit: e59af2abe692a1b16e8d11e2698714cf3d77d8c8
Component: engine
2017-03-02 09:23:01 +08:00
948c24d8aa
remove Jekyll tags from CLI reference
...
These Markdown files are now embedded in a YAML
file for templating in the documentation, and
these special markers are no longer needed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7e3169f26d4600691de9698598a2e5a064ea85eb
Component: engine
2017-03-02 02:14:15 +01:00
e79e000efa
Merge pull request #30657 from madhanrm/ns1
...
Support --net=container:<NameOrID> for windows (Shared Pod Network)
Upstream-commit: 9358189fa38d046afffb81f367067db91c611fd5
Component: engine
2017-03-01 13:59:52 -08:00
