Vincent Demeester
ac8256a95d
Merge pull request #26972 from allencloud/clear-health-monitor-log
...
make health check log more readable
Upstream-commit: 601004e1a714d77d3a43e957b8ae8adbc867b280
Component: engine
2016-09-28 14:22:43 +02:00
Sebastiaan van Stijn
8a19fb43a4
Merge pull request #26941 from runcom/docker-init-path-1
...
configure docker-init binary path
Upstream-commit: 9f0593990f6d8ac95a5dde312e0b7401b472cfb9
Component: engine
2016-09-28 13:12:59 +02:00
Vincent Demeester
f6b8936533
Merge pull request #24850 from yongtang/24270-service-tasks-filter
...
Fix partial/full filter issue in `service tasks --filter`
Upstream-commit: b0e1b8fc79af0baf5d90329254aacbdfb4188bfc
Component: engine
2016-09-28 11:50:27 +02:00
allencloud
a7102311d0
make health check log more readable
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: a4a4f3733f18053269293d6f2e56767c564940d3
Component: engine
2016-09-28 14:10:15 +08:00
Vincent Demeester
be83d1256c
Merge pull request #26074 from allencloud/return-err-when-remove-container-in-progress
...
make client side know container removal in progress
Upstream-commit: 97d4b9c46528c2d263a448658a6cf78ffd943075
Component: engine
2016-09-27 18:48:03 +02:00
Vincent Demeester
4ab44ced86
Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure
...
Add isolation to info - enables Hyper-V containers CI bring-up
Upstream-commit: b881148385685f3c538a3a085207bfdf30ae9213
Component: engine
2016-09-27 18:46:51 +02:00
Brian Goff
fa6f37076c
Merge pull request #26898 from YuPengZTE/devErrorsNew
...
In error, the first letter is low-case letter
Upstream-commit: c2f57291ac04a1d582d7fcdedda7b1ad707543d5
Component: engine
2016-09-27 10:10:57 -04:00
Antonio Murdaca
195692ee1c
configure docker-init binary path
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 6a12685bb7eaa5744c5a115ffe12f3a4d80093bb
Component: engine
2016-09-27 14:49:17 +02:00
Yong Tang
562ec15f92
Let swarmkit handle cluster defaults in swarm init if not specified
...
This fix tries to address the issue raised in 24958 where previously
`docker swarm init` will automatically fill in all the default value
(instead of letting swarmkit to handle the default).
This fix update the `swarm init` so that initial value are passed only
when a flag change has been detected.
This fix fixes 24958.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: eb19c2f080f624d8b0186f8037cdc1f7d8ada402
Component: engine
2016-09-27 04:19:38 -07:00
allencloud
672761b64e
make client side know container removal in progress
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 9a58f298d182945eb2b820e5e3539b754fdaa751
Component: engine
2016-09-27 18:06:54 +08:00
Vincent Demeester
67175b8b48
Merge pull request #24634 from thaJeztah/make-network-name-required
...
API return network-list if no network-name or id is provided
Upstream-commit: b826bebda0cff2cc2d3083b954c810d2889eefe5
Component: engine
2016-09-27 10:20:38 +02:00
YuPengZTE
ebdbeeeb36
In error, the first letter is low-case letter
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: 110ab746ba50e9febcdd246671f258036c71e59a
Component: engine
2016-09-27 10:40:07 +08:00
Yong Tang
361ed59824
Fix partial/full filter issue in service tasks --filter
...
This fix tries to address the issue related to 24108 and 24790, and
also the case from 24620#issuecomment-233715656
The reason for the failure case in the above mentioned issues is that
currently Task names are actually indexed by Service Name
(`e.ServiceAnnotations.Name`)
To fix it, a pull request in swarmkit (swarmkit/pull/1193) has been
opened separately.
This fix adds the integration tests for the above mentioned issues.
Swarmkit revendoring is needed to completely fix the issues.
This fix fixes 24108.
This fix fixes 24790.
This fix is related to 24620.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f676fc93c3791f72938a6be9c7517ac620c02d1c
Component: engine
2016-09-26 16:01:20 -07:00
Alexander Morozov
c712a740c1
Merge pull request #26891 from allencloud/fix-26890-duplicate-overlay-drivers-in-info
...
fix #26890 avoid duplicate overlay drivers in info
Upstream-commit: 8dc63675c547d0f29f03b1e0e042b8045245d02f
Component: engine
2016-09-26 14:42:39 -07:00
Alexander Morozov
80748a530c
Merge pull request #26927 from thaJeztah/update-layerstore-for-solaris
...
Add setupInitLayer() placeholder for Solaris
Upstream-commit: 5a8cee5ab6ba640939b1fec27596ebb1eb572988
Component: engine
2016-09-26 14:36:58 -07:00
Michael Crosby
9a2a361f03
Merge pull request #26536 from anusha-ragunathan/aufs_unmount
...
Add retry logic during aufs unmount.
Upstream-commit: c35ab68665d0fbaa759150e8f13703a2f79b2e75
Component: engine
2016-09-26 13:17:12 -07:00
Sebastiaan van Stijn
b667e379f0
Add setupInitLayer() placeholder for Solaris
...
Commit d2bc5d62761c24866e4b0ff4099dd54264bd9325 added
a setupInitLayer() for all platforms, but did not
add a placeholder for Solaris.
This adds the missing placeholder.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: eb2fbaa3f2c59bf4a78a3f642fe99a74e3e33b3e
Component: engine
2016-09-26 22:05:28 +02:00
Sebastiaan van Stijn
6352e3e776
API return network-list if no network-name or id is provided
...
When calling the /networks/ endpoint with a trailing
slash, the default network was returned.
This changes the endpoint to return the list of networks
instead (same response as `/networks` without trailing
slash).
Also updated the description for GetNetworkByName to
explain that the "default" network is returned if
no name or id is provided.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6ad4bf0a533f8851b0ddccb56fe3b457819f6146
Component: engine
2016-09-26 21:44:34 +02:00
Arnaud Porterie
356aff7cd8
Merge pull request #26839 from tonistiigi/build-cache
...
Implement build cache based on history array
Upstream-commit: 7944480dd0dfb00323f960d37c31d0ddad5f6cf2
Component: engine
2016-09-26 17:31:49 +00:00
allencloud
32c9e42dd1
fix #26890 avoid duplicate overlay drivers in info
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: ea266f8f7ad74f671cc7595c17ea122a5593bec4
Component: engine
2016-09-27 00:19:04 +08:00
Yanqiang Miao
dc54335e17
Delete the redundant function 'errClusterNetworkOnRun'
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 9c3d1236d22504410bf7363acbad382917e3a630
Component: engine
2016-09-24 11:24:48 +08:00
Anusha Ragunathan
07eae6add2
Add retry logic during aufs unmount.
...
Treat EBUSY as a transient error and retry. Also stop ignoring unmount errors.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 0e539fec331cb9dbc4ef784b55516570b11affe2
Component: engine
2016-09-23 13:15:04 -07:00
John Howard
a034d841ce
Add isolation to info
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c4e169727474f24cb0eddea15b94aaa2bfbb3281
Component: engine
2016-09-23 12:13:29 -07:00
Tõnis Tiigi
cc3c0d322a
Implement build cache based on history array
...
Based on work by KJ Tsanaktsidis
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Signed-off-by: KJ Tsanaktsidis <kjtsanaktsidis@gmail.com >
Upstream-commit: 690882c2e79c3f3742c709cf158584e61594ba00
Component: engine
2016-09-23 11:30:06 -07:00
Brian Goff
a1a96e1887
Merge pull request #26534 from allencloud/better-checkpoint
...
change code and fix docs about checkpoint
Upstream-commit: 047400c64c9a19fe9c20176dc9ca5d86301a91ae
Component: engine
2016-09-23 12:34:55 -04:00
Brian Goff
d76a37578e
Merge pull request #26844 from mrjana/net
...
Vendoring libnetwork @6caf9022fa09
Upstream-commit: 2c41c020d19e76030a4c6447fafe79eb8171ab14
Component: engine
2016-09-23 12:03:02 -04:00
John Howard
7366022982
Merge pull request #26842 from jstarks/fix_save
...
Windows: Back up files mutated during layer import
Upstream-commit: 5039d9aa6ccf6e6cbcefe7b61c4f1e0af0171bd2
Component: engine
2016-09-23 08:37:24 -07:00
allencloud
f557e61a5e
change-code-and-fix-docs-about-checkpoint
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 9b4ba34d046fc9fd65fc060af016d2b2b9b95957
Component: engine
2016-09-23 19:37:43 +08:00
Sebastiaan van Stijn
29a3433f96
Merge pull request #26805 from miaoyq/refactor-allocateNetwork
...
Replace two array with a map type, make it easier to understand.
Upstream-commit: 8643903e49c2d25272e59fe09a75803aa05ed841
Component: engine
2016-09-23 10:15:37 +02:00
Jana Radhakrishnan
c42acbfe8e
Add GetListenAddress in ClusterProvider
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: fbcdca7ebcd45d74c40fbccbb07f2d3decfb8628
Component: engine
2016-09-22 21:00:32 -07:00
Madhu Venugopal
0afb3aa46c
Merge pull request #25987 from msabansal/dnssupport
...
Support for Windows service discovery
Upstream-commit: d3139fc84af390142341a29d3512462d1a449045
Component: engine
2016-09-22 20:56:03 -07:00
Yanqiang Miao
792dff1fb0
Replace two array with a map type, make it easier to understand.
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 1989b1b58cc8c416e430a1fd824626b259dab5f6
Component: engine
2016-09-23 09:52:05 +08:00
Madhu Venugopal
e7ceeb1efb
Merge pull request #26287 from msabansal/composefix
...
Fixed support for docker compose by allowing connect/disconnect on stopped containers
Upstream-commit: 9896fa356c39faafb79ce2efe3550d498eb5d1fa
Component: engine
2016-09-22 18:09:51 -07:00
John Starks
5c56a3d561
Windows: Back up files mutated during layer import
...
The Windows BCD store for the utility VM is mutated during layer import,
which causes failures in docker save. Back up the BCD store and related
log files so that save has access to their original contents.
Fixes #25893 .
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 9c79b0efc02c6452cb9521faa466dcc118a0e433
Component: engine
2016-09-22 17:44:38 -07:00
Brian Goff
d8c41a1861
Merge pull request #26814 from p4l1ly/master
...
overlayfs added to FsNames
Upstream-commit: 5fa48f2e406b3979cda9bd3b29f77bf68fe9e61b
Component: engine
2016-09-22 16:26:46 -04:00
msabansal
6bf922c44e
Changes required to support windows service discovery
...
Signed-off-by: msabansal <sabansal@microsoft.com >
Upstream-commit: d1e0a78614d4efa768c88c9db3868bc9e7782efc
Component: engine
2016-09-22 12:21:21 -07:00
John Howard
debe74e333
Windows OCI: Remove endpoint list
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 410a8612f481e67265ce0edaf78ed1d96f6dffcf
Component: engine
2016-09-22 10:08:13 -07:00
Michael Crosby
7195c6a9d6
Merge pull request #26746 from Microsoft/jjh/hvruntime
...
Windows: OCI HVRuntime and LayerPaths to options
Upstream-commit: 3990f2816250cba4d48a867eccdc86712d0990b2
Component: engine
2016-09-22 09:55:58 -07:00
Pavol Vargovcik
d36b90b866
overlayfs added to FsNames
...
Signed-off-by: Pavol Vargovcik <pallly.vargovcik@gmail.com >
Upstream-commit: fe5c91c388e2cd98720a6804b7c637cb21870933
Component: engine
2016-09-22 14:35:40 +02:00
Vincent Demeester
6b6c0bf977
Merge pull request #26774 from thaJeztah/remove-engine-api-leftovers
...
Remove engine-api leftovers
Upstream-commit: d9aec43a16bb62f4804c78c8d368918a2fbcdbfb
Component: engine
2016-09-22 09:39:27 +02:00
Michael Crosby
894b99ac52
Merge pull request #26756 from rhvgoyal/init-rw-layer
...
layer_store: Use CreateReadWrite() for -init layer instead of Create()
Upstream-commit: d2bc5d62761c24866e4b0ff4099dd54264bd9325
Component: engine
2016-09-21 15:45:06 -07:00
msabansal
51c529dd35
Fixed support for docker compose by allowing connect/disconnect on stopped containers
...
Signed-off-by: msabansal <sabansal@microsoft.com >
Upstream-commit: 50f02b585c6e5866cf458c7f91a2e99e82ea9a2d
Component: engine
2016-09-21 13:29:17 -07:00
Vivek Goyal
952f960124
layer_store: Use CreateReadWrite() for -init layer instead of Create()
...
init layer is read/write layer and not read only layer. Following commit
introduced new graph driver method CreateReadWrite.
ef5bfad Adding readOnly parameter to graphdriver Create method
So far only windows seem to be differentiating between above two methods.
Making this change to make sure -init layer calls right method so that
we don't have surprises in future.
Windows does not need init layer. This patch also gets rid of creation of
init layer on windows.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 2508ca000e79dfe1a956b0078a0d196dd6b66dab
Component: engine
2016-09-21 14:45:25 -04:00
Vincent Demeester
b9df1ee797
Merge pull request #26737 from miaoyq/del-setting-hostconfig-during-start-container
...
Modify the print and comment of setting host configuration options when the container starts
Upstream-commit: 340f50c1c4e1c0dc54f1d94b4dedf3f46db0d12b
Component: engine
2016-09-21 13:30:53 +02:00
Sebastiaan van Stijn
7c1d86c305
Removed engine-api leftovers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 45818d6fc49e6da0369a33f015967fff7417df1c
Component: engine
2016-09-21 12:36:52 +02:00
Sebastiaan van Stijn
70015a6933
Merge pull request #26723 from anusha-ragunathan/volmount_win
...
Add missing call to "VolumeDriver.Mount" during container start.
Upstream-commit: fd1037b4325c1ae5b2e68d6f39ee0cd58a0a7d48
Component: engine
2016-09-21 10:28:29 +02:00
Antonio Murdaca
d73f6e50df
Merge pull request #26751 from Microsoft/jjh/reverthostconfig
...
Revert Box from HostConfig
Upstream-commit: b683958deeaae20463649085516d57df2fbdec53
Component: engine
2016-09-21 09:53:39 +02:00
John Howard
f621a80cd1
Windows: OCI HVRuntime and LayerPaths to options
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a3aceeac50f35e2b10323087b2a1f21af45ee143
Component: engine
2016-09-20 13:51:53 -07:00
Tõnis Tiigi
4145d55809
Merge pull request #26641 from Microsoft/jjh/aggressivenamespacing
...
Windows: OCI aggressive namespacing
Upstream-commit: 511fd4940282f4ed6df39f3c2ebc8b9a0f060c82
Component: engine
2016-09-20 13:37:41 -07:00
John Howard
7b0a3056fd
Revert Box from HostConfig
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6b74e2f09dfe2627cd639d683e0896b938f38313
Component: engine
2016-09-20 12:01:04 -07:00
Vincent Demeester
Sebastiaan van Stijn
allencloud
Brian Goff
Antonio Murdaca
Yong Tang
YuPengZTE
Alexander Morozov
Michael Crosby
Sebastiaan van Stijn
Arnaud Porterie
Yanqiang Miao
Anusha Ragunathan
John Howard
Tõnis Tiigi
John Howard
Jana Radhakrishnan
Madhu Venugopal
John Starks
msabansal
Pavol Vargovcik
Vivek Goyal
Antonio Murdaca