cbea8edb83
Use stdlib TLS dialer
...
Since go1.8, the stdlib TLS net.Conn implementation implements the
`CloseWrite()` interface.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2ac277a56f50d0ad1831603dccbca5c19ff717e9
Component: engine
2018-06-08 14:24:30 -07:00
bae6d423c4
Merge pull request #37184 from cpuguy83/attach_leak
...
Fix fd leak on attach
Upstream-commit: 5cb95f693dc7170a97401e6e3059e8fd134dc475
Component: engine
2018-06-08 13:08:06 -07:00
07f52be94c
Merge pull request #37236 from johnstep/fix-client-test-env-cleanup
...
Clean up in TestNegotiateAPIVersionEmpty
Upstream-commit: 67f26c79d94ded25f0a2abcc0d631a94714af5e0
Component: engine
2018-06-08 13:06:53 -07:00
6a80f2d39d
Merge pull request #36161 from fanjiyun/edit
...
When link id is empty for overlay2, do not remove this link.
Upstream-commit: a7b6643c5f12e9048e6434aca5855d2041bbaada
Component: engine
2018-06-08 09:12:22 -07:00
3a0f08270b
Merge pull request #37240 from francescomari/toolbox-link
...
Fix link to Docker Toolbox
Upstream-commit: d072a3658b5dc81f31c6cb59eea42681db8df52c
Component: engine
2018-06-08 07:23:32 -07:00
1fd604f1f8
Fix link to Docker Toolbox
...
Signed-off-by: Francesco Mari <mari.francesco@gmail.com >
Upstream-commit: a045b027bf8f9e19fd53c2b33399fad901b1dd34
Component: engine
2018-06-08 16:12:00 +02:00
885386e772
Merge pull request #37195 from adshmh/refactor-integration-test-create-network-calls-macvlan
...
Refactor macvlan network integration tests to use network.Create
Upstream-commit: 162ba6016def672690ee4a1f3978368853a1e149
Component: engine
2018-06-08 09:46:04 +02:00
0fba2438fd
Merge pull request #37234 from kolyshkin/plugin-panic
...
Fix daemon panic on restart when a plugin is running
Upstream-commit: 712dd62a348b2da1508bc81cfb852b0f05c0ede3
Component: engine
2018-06-08 09:45:25 +02:00
10e74b4423
Merge pull request #37235 from kunaltyagi/vim-filename
...
[vim] Be case insensitive for D in dockerfile
Upstream-commit: fe3d0233ef711a049a0409f33fb298f13cd0f31d
Component: engine
2018-06-08 09:39:18 +02:00
d23610aaff
Merge pull request #37233 from dnephin/add-metrics-for-pull
...
Add image metrics for push and pull
Upstream-commit: 4703b284e6695524a58ae0cd6f94eaf7359bd500
Component: engine
2018-06-08 00:26:12 -07:00
d95a00a489
Merge pull request #37189 from arm64b/create-intermediate-for-COPY-ADD
...
Refactor and cleanup the intermediate container creation
Upstream-commit: 52ea99eda2ea29d9a0e4111f1e7a0b382d8d9408
Component: engine
2018-06-07 21:20:17 -07:00
f15217a073
Merge pull request #34218 from yosifkit/close-readclosers
...
Close readclosers returned by DecompressStream
Upstream-commit: e3e552ac8129de1af66af90f67b694843ab0df0a
Component: engine
2018-06-07 20:42:30 -07:00
f2b19f94a1
Clean up in TestNegotiateAPIVersionEmpty
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: b801361064f708bf7f8adb93a18570c25de58219
Component: engine
2018-06-07 20:05:29 -07:00
cdee8f774a
Merge pull request #37183 from vdemeester/service-create-init
...
Add support for `init` on services
Upstream-commit: f11f24958852986cfc996e6076fed75bfcbf1ed1
Component: engine
2018-06-07 19:22:14 -07:00
3f03982f9a
Allow vim be case insensitive for D in dockerfile
...
Signed-off-by: Kunal Tyagi <tyagi.kunal@live.com >
Upstream-commit: 6b8dab2181097c83670b65c2f76f83307058c987
Component: engine
2018-06-08 10:30:40 +09:00
a1a394884c
Merge pull request #37231 from adshmh/use-unique-names-for-integration-tests-service-create
...
use unique names for resources in create service integration tests
Upstream-commit: 5ff12f6ba13edf16a174250b65b1c7294fbd5a45
Component: engine
2018-06-07 17:47:07 -07:00
2ca4487c26
When id is empty for overlay2/overlay, do not remove the directories.
...
Signed-off-by: fanjiyun <fan.jiyun@zte.com.cn >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0e8f96e31724a7bb49d0ade9acec116f68c85c74
Component: engine
2018-06-07 17:35:54 -07:00
54e00c6a5c
Fix panic on daemon restart with running plugin
...
Scenario:
Daemon is ungracefully shutdown and leaves plugins running (no
live-restore).
Daemon comes back up.
The next time a container tries to use that plugin it will cause a
daemon panic because the plugin client is not set.
This fixes that by ensuring that the plugin does get shutdown.
Note, I do not think there would be any harm in just re-attaching to the
running plugin instead of shutting it down, however historically we shut
down plugins and containers when live-restore is not enabled.
[kir@: consolidate code to deleteTaskAndContainer, a few minor nits]
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: dbeb4329655e91dbe0e6574405937f03fabf3f2f
Component: engine
2018-06-07 17:27:02 -07:00
97950284c3
Add image metrics for push and pull
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: 6910019bbebd71d6bb5c949a40e96b49a6b41f45
Component: engine
2018-06-07 18:26:12 -04:00
92d9a5ddfd
Merge pull request #37215 from adshmh/integration-container-links-tests-use-unique-names
...
container links integration tests use unique names
Upstream-commit: d47c45175b13e97475649dfe8b1ab1034c4865d0
Component: engine
2018-06-07 22:34:12 +02:00
e55ae1efdd
Merge pull request #37232 from vdemeester/o-rly
...
Mark @thajeztah as a MAINTAINER…
Upstream-commit: d9b96d90c62063b506d28f685870f65f1fd4154d
Component: engine
2018-06-07 22:33:45 +02:00
dc6063672c
Close readclosers returned by DecompressStream
...
Signed-off-by: Joe Ferguson <joe@infosiftr.com >
Upstream-commit: 76e99e1a8b60c831415d2f6a6a7954e16c25620b
Component: engine
2018-06-07 11:16:13 -07:00
c2a60aeb45
Mark @thajeztah as a MAINTAINER…
...
… discovered recently that our very own Sebastiaan was not even listed
in the maintainers, so fixing this mistake !
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 7f9dd507d3f50cd343480cb0776a3ccca83c5764
Component: engine
2018-06-07 19:50:41 +02:00
29579f20f8
use unique names for resources in create service integration tests
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: d5ae23fc11b91275801dcab2326e803725a645a6
Component: engine
2018-06-07 12:11:11 -04:00
43d60463c2
Add support for init on services
...
It's already supported by `swarmkit`, and act the same as
`HostConfig.Init` on container creation.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e401b88e59e098745744917c555d549f08353e6d
Component: engine
2018-06-07 14:17:55 +02:00
025606b2a1
Merge pull request #36644 from jessfraz/rawaccess
...
api: add MaskedPaths and ReadonlyPaths options
Upstream-commit: 1fe0e49d2057d5ee1b12cc6f53e4c41a197e7fec
Component: engine
2018-06-06 18:16:16 -07:00
bf25aa33ff
Merge pull request #37209 from thaJeztah/bump_libnetwork
...
bump libnetwork to 3931ba4d815e385ab97093c64477b82f14dadefb
Upstream-commit: 21291e5aefe1f13f3208d57bcc4183848c492bd1
Component: engine
2018-06-06 13:41:33 -07:00
5028541e5c
Merge pull request #37192 from thaJeztah/update_miekd_dns
...
Update miekg/dns to v1.0.7
Upstream-commit: 9b0b9a0ece532caa806594b5fbc5eef2d6777b10
Component: engine
2018-06-06 11:24:54 -07:00
9022898c18
integration tests under integration/container/links_linux_test.go use unique names
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 077247050df0bf97b7b62e439152eb362e9ec813
Component: engine
2018-06-06 06:14:24 -04:00
f6411898cc
Merge pull request #36895 from dmcgowan/vendor-containerd-master
...
Update containerd to 1.1
Upstream-commit: fd2f2a919e392b96de74795ae9af2dc5e510bc4c
Component: engine
2018-06-05 21:43:31 -07:00
8925778ea9
Merge pull request #37211 from vdemeester/fix-volume-unit-test
...
Fix wrong assertion in volume/service package
Upstream-commit: 340fd5e2370714f54ae99b8679a4311617848bc5
Component: engine
2018-06-05 13:14:13 -07:00
4cdb057509
bump libnetwork to 3931ba4d815e385ab97093c64477b82f14dadefb
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: fe02b187555b25cb1a92ecaaac2b8b9f5b6a293d
Component: engine
2018-06-05 11:29:23 -07:00
50be59326e
Fix wrong assertion in volume/service package
...
This last assertion shouldn't be there, those cases should be handled
by the for/switch above.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 04207c2db9cd82e47aa82bc2834fe3820086a697
Component: engine
2018-06-05 18:51:17 +02:00
67fe100ad5
api: add configurable MaskedPaths and ReadOnlyPaths to the API
...
This adds MaskedPaths and ReadOnlyPaths options to HostConfig for containers so
that a user can override the default values.
When the value sent through the API is nil the default is used.
Otherwise the default is overridden.
Adds integration tests for MaskedPaths and ReadonlyPaths.
Signed-off-by: Jess Frazelle <acidburn@microsoft.com >
Upstream-commit: 3694c1e34e40fa2e255a97b5541645cec9c8d1d5
Component: engine
2018-06-05 12:33:14 -04:00
f422827dd4
refactored integration tests under integration/network/macvlan to use network.Create
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 0418893f0b5a7413edd950cfabd2337161edc705
Component: engine
2018-06-05 06:32:24 -04:00
8a3da41a28
Added network package to integration/internal to refactor integration tests calls to client.NetworkCreate
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 0e3012cfff1e81f7c779b1310f6069dc909d7987
Component: engine
2018-06-05 06:32:24 -04:00
2452577cb1
Merge pull request #37194 from AntaresS/fix-test-failure
...
fix a failed test
Upstream-commit: ca25df3b54300e897d96029dcc4f86b8c4215a27
Component: engine
2018-06-05 02:38:04 +02:00
0e7017a3ae
Merge pull request #36688 from cpuguy83/volumes_service
...
Extract volume interaction to a volumes service
Upstream-commit: 5037c5a8ce762b46638378b7a7d1081572eadba1
Component: engine
2018-06-05 02:16:20 +02:00
77116c8094
Update containerd daemon
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: a0009345f51d7a58a2f188d7ffc7e0e837a5238d
Component: engine
2018-06-04 15:37:03 -07:00
60c800804e
Update containerd to 1.1
...
Updates swarmkit, grpc, and all related vendors
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: 52ed3e0896c203013388a3eb603658f345a9d80a
Component: engine
2018-06-04 15:37:03 -07:00
94cab3b97b
Merge pull request #37191 from adshmh/use-unique-names-for-integration-tests-secret
...
use unique names for resources in integration tests of secret package
Upstream-commit: d7e94d6ea7c1a76c79b6da722491c79118236999
Component: engine
2018-06-05 00:06:50 +02:00
82d56e0c15
fix a failed test
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
Upstream-commit: 1d9973c0d4c51362e8c5b38e585a025c90baf085
Component: engine
2018-06-04 14:29:00 -07:00
f5f666914b
Merge pull request #37197 from tonistiigi/vendor-buildkit
...
vendor: dockerfile parser from buildkit
Upstream-commit: e466f999aa9d2add9ccaca655f8d53c3112c121d
Component: engine
2018-06-04 14:53:22 +02:00
1542f5e969
Refactor and cleanup the intermediate container creation
...
This PR is trying to refactor the `probeAndCreate` and cleanup
related codes based on the refactoring.
Signed-off-by: Dennis Chen <dennis.chen@arm.com >
Upstream-commit: 7f280f6f6514598a31d2523d4b9437ca07ee0526
Component: engine
2018-06-04 12:55:49 +08:00
79ad4e84bf
Merge pull request #37190 from vdemeester/allow-make-run-with-args
...
Allow to add any args when doing a make run
Upstream-commit: 641e2c01cca0c9c66b173a52c1f1ef12a934dfa9
Component: engine
2018-06-03 03:42:02 +09:00
f01f23683f
vendor: add new opentracing deps for session tracing
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ad77dee8baafc478baa18f65a4972ba19b6e973f
Component: engine
2018-06-02 11:10:38 -07:00
2f23577c7a
vendor: use dockerfile parser from buildkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: c9ebd2f13b3aab49c2d90cc38dcf2cd0d059697f
Component: engine
2018-06-02 11:10:34 -07:00
de438df3a8
Allow to add any args when doing a make run
...
`make DOCKERD_ARGS=--init binary run` should start the daemon with
`--init` as flags (with any other "automagically" added ones).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d2af0d96e3fbdfec340cb707b795b863411b00e1
Component: engine
2018-06-01 19:19:20 +02:00
9d9413af9f
Update miekg/dns to v1.0.7
...
This dependency now uses SemVer, tagged releases.
Also updates dependencies
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4acddf21b7c11c2c6a71f0f9ba1d329cfbb99e5f
Component: engine
2018-06-01 16:24:59 +02:00
37acacf605
use unique names for resources in integration tests of integration/secret package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: a70794aff0fc5a02db9c939397d663f174d2f726
Component: engine
2018-06-01 06:46:52 -04:00
