Harald Albers
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
Vincent Demeester
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
Vincent Demeester
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
Vincent Demeester
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
Akihiro Suda
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
Brian Goff
00fbdfcce4
Merge pull request #31409 from yuexiao-wang/fix-version
...
'docker daemon' deprecation message doesn't use the new version
Upstream-commit: 1da02be7f5
Component: cli
2017-03-02 22:02:09 -05:00
yuexiao-wang
96ae1f807e
'docker daemon' deprecation message doesn't use the new versioning scheme
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 3f82787403
Component: cli
2017-03-03 17:26:49 +08:00
Brian Goff
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
yuexiao-wang
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
Tibor Vass
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
John Howard
b03c0791bf
Windows: Cleanup HCS on restore
...
Signed-off-by: John Howard <jhoward@microsoft.com >
This ensures that any compute processes in HCS are cleanedup
during daemon restore. Note Windows cannot (currently) reconnect
to containers on restore.
Upstream-commit: f59593cbd1c177fe2d5a1b1f00efe9987d25a526
Component: engine
2017-03-02 15:13:12 -08:00
Justin Cormack
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
David McKay
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
Vincent Demeester
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
Sven Dowideit
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
Sebastiaan van Stijn
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
Boris Pruessmann
03cd854634
Fixed incompatibilities with latest xenial
...
Signed-off-by: Boris Pruessmann <boris@pruessmann.org >
Upstream-commit: 47d887b33d7725ef64222f457369e4363ac7bb2d
Component: engine
2017-03-02 13:46:11 +01:00
Vincent Demeester
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
scjane
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
Sebastiaan van Stijn
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
Vincent Demeester
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
Sebastiaan van Stijn
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
Aleksa Sarai
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
Vincent Demeester
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
Akihiro Suda
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
fate-grand-order
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Kenfe-Mickaël Laventure
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
chchliang
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
Sebastiaan van Stijn
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
Alexander Morozov
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
Brian Goff
2b392cf3cd
Merge pull request #31434 from tophj-ibm/skip-more-plugin-tests
...
[multi-arch] skip more plugin tests on non-x86
Upstream-commit: 563eb10202b6f2c2814964c7ec5ab9fe9d4c8a16
Component: engine
2017-03-01 16:01:28 -05:00
Sebastiaan van Stijn
324d1b77a6
Merge pull request #29775 from AkihiroSuda/integration-cli-on-swarm
...
[EXPERIMENTAL] Integration Test on Swarm (completes in about 5 minutes, with 10 Swarm nodes)
Upstream-commit: 01ed606439976e8a159c2a8406228ac52941ae47
Component: engine
2017-03-01 21:16:05 +01:00
Vincent Demeester
ecbbe626b3
Move TearDownTest cleaning to environment package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 1858656925c8705ae433769fbb9a2c18b6685a69
Component: engine
2017-03-01 21:04:11 +01:00
Ying Li
2b8ba501aa
Rather than remove the swarm directory and re-create, remove the swarm subdirs
...
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 68506bd23998cb229e05f70e3e923f64c43b2526
Component: engine
2017-03-01 11:56:39 -08:00
Boris Pruessmann
8bdc10bd7a
Incorporated feedback from review
...
Signed-off-by: Boris Pruessmann <boris@pruessmann.org >
Upstream-commit: ea70c9f596bb5cb523ce8baa4bf8caf53efd90bc
Component: engine
2017-03-01 20:27:53 +01:00
David Sheets
93ad69786f
Add 'consistent', 'cached', and 'delegated' mode flags
...
This adds 'consistency' mode flags to the mount command line argument.
Initially, the valid 'consistency' flags are 'consistent', 'cached',
'delegated', and 'default'.
Signed-off-by: David Sheets <dsheets@docker.com >
Signed-off-by: Jeremy Yallop <yallop@docker.com >
Upstream-commit: f13297c0beaf4fcc6742a9f3c047cbfeef955ac1
Component: engine
2017-03-01 18:13:47 +00:00
Jérôme Petazzoni
cadfdae24c
Make rc announcement mandatory
...
Last month, when people upgraded their K8S clusters to use Engine 1.13, networking broke for them
because the default forwarding policy changed to `DROP` to increase the security and prevent some
specific network attacks. After a [long discussion on Twitter](https://twitter.com/jbeda/status/826969113801093121 )
we realized that while the 1.13-rc releases had been out for months, they hadn't received as much
testing as we wanted because they hadn't been announced through all available channels.
This is a proposal to alter the release process to make sure that release candidate versions are
announced as widely as possible.
Signed-off-by: Jerome Petazzoni <jerome.petazzoni@gmail.com >
Upstream-commit: 1135eadff95f15ca250cf87df7a0eae0324f619f
Component: engine
2017-03-01 10:06:00 -08:00
Sebastiaan van Stijn
fd3a8adfe2
Merge pull request #30754 from yongtang/25696-stop-signal
...
Add `--stop-signal` for `service create` and `service update`
Upstream-commit: decce9cad1
Component: cli
2017-03-01 18:10:57 +01:00
Sebastiaan van Stijn
13f20b59db
Merge pull request #30754 from yongtang/25696-stop-signal
...
Add `--stop-signal` for `service create` and `service update`
Upstream-commit: bb9f19503cbb0153a0da01b1e91691cd63f48dd9
Component: engine
2017-03-01 18:10:57 +01:00
Sebastiaan van Stijn
ab3f294aab
do not ignore "volume in use" errors when force-delete
...
When using `docker volume rm -f`, all errors were ignored,
and volumes where Purged, even if they were still in
use by a container.
As a result, repeated calls to `docker volume rm -f`
actually removed the volume.
The `-f` option was implemented to ignore errors
in case a volume was already removed out-of-band
by a volume driver plugin.
This patch changes the remove function to not
ignore "volume in use" errors if `-f` is used.
Other errors are still ignored as before.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9d521a4d2fbbeec0f672b986e294fd5f1c4d2f32
Component: engine
2017-03-01 16:36:43 +01:00
Lei Jitang
3da961cb82
devicemapper: fix suspend removed device
...
when doing devices.cancelDeferredRemoval, the device could have been removed
and return ErrEnxio, but it continue to check if it is need to do suspend.
doSuspend := devinfo != nil && devinfo.Exists != 0 uses a devinfo which is
get before devices.cancelDeferredRemoval(baseInfo), it is outdate, the device
has been removed and there is no need to do suspend. If do suspend it will return
devicemapper: Error running deviceSuspend dm_task_run failed.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 6e25bb2ed6560baec4b13930e673c88f1b49de34
Component: engine
2017-03-01 21:58:14 +08:00
Sebastiaan van Stijn
4a0012206d
Merge pull request #31412 from vdemeester/integration-request-pass
...
[test-integration] convert request.SockRequestRaw to appropriate methods
Upstream-commit: fabe16ee34bd8df42b25bb21b9a0b2d427e85adb
Component: engine
2017-03-01 14:15:50 +01:00
Sebastiaan van Stijn
c367119f5f
Merge pull request #31124 from vdemeester/volume-unit-tests
...
Add unit tests to cli/command/volume package
Upstream-commit: 04d124ff1b
Component: cli
2017-03-01 14:13:47 +01:00
Sebastiaan van Stijn
d88605d898
Merge pull request #31124 from vdemeester/volume-unit-tests
...
Add unit tests to cli/command/volume package
Upstream-commit: 822abee15132259226ae4bd4523737330164ec58
Component: engine
2017-03-01 14:13:47 +01:00
Vincent Demeester
b88ef740b7
Merge pull request #31442 from lixiaobing10051267/masterBuildTest
...
fix wrong foo to zzz in docker_cli_build_test.go
Upstream-commit: 72989415ac510e9a4657d1a30efafe26142a7dd6
Component: engine
2017-03-01 11:51:44 +01:00
lixiaobing10051267
629b5cebad
fix wrong foo to zzz in docker_cli_build_test.go
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 2276de8704d9b235306b50be748afa98a574a5cb
Component: engine
2017-03-01 17:49:54 +08:00
Madhan Raj Mookkandy
709434a772
(*) Support --net:container:<containername/id> for windows
...
(*) (vdemeester) Removed duplicate code across Windows and Unix wrt Net:Containers
(*) Return unsupported error for network sharing for hyperv isolation containers
Signed-off-by: Madhan Raj Mookkandy <MadhanRaj.Mookkandy@microsoft.com >
Upstream-commit: 040afcce8f3f54c64d328929c5115128f623deb1
Component: engine
2017-02-28 20:03:43 -08:00
Tianon Gravi
3a92124ae2
Merge pull request #31076 from AkihiroSuda/check-vendor
...
hack/validate/vendor: add more checks
Upstream-commit: 6e04fbf748a138419d28a85a4544379e8ae64310
Component: engine
2017-02-28 15:35:16 -08:00