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
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
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
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
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
d2c390cca0
Merge pull request #37177 from cpuguy83/minor_plugin_addr_change
...
Move plugin client to separate interface
Upstream-commit: 71cd53e4a197b303c6ba086bd584ffd67a884281
Component: engine
2018-05-31 08:22:04 -07:00
6aff3ef24e
Merge pull request #37174 from thaJeztah/no_additional_magic_matching
...
Be explicit about github.com prefix being a legacy feature
Upstream-commit: 2ea4ece674e04c04174ee9fff8005cdccdc4fad0
Component: engine
2018-05-31 09:45:59 +02:00
065fbace32
Merge pull request #37178 from tonistiigi/layer-leak
...
builder: fix layer leak on multi-stage wildcard copy
Upstream-commit: 3e494c4b934b7fc3756d91b6e8117c9e4d7c28f1
Component: engine
2018-05-31 09:39:28 +02:00
6cb96e5d79
Merge pull request #37179 from AntaresS/fix-skip
...
fix mis-used skip condition
Upstream-commit: b94d12be0c36c98e010da97b67e9a75c35478bad
Component: engine
2018-05-30 20:04:39 -10:00
98281f1a9c
fix the mis-used skip condition
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
Upstream-commit: d8e6f273b5016880c5d49673ddf531ceecc2bc0d
Component: engine
2018-05-30 17:13:20 -07:00
84cf46c71d
Merge pull request #37134 from thaJeztah/fix-env-substitution
...
builder: fix processing of invalid substitusion syntax
Upstream-commit: b2719e35f58c5420ae3dd6ab8e583fba8c6cf6d9
Component: engine
2018-05-30 16:52:01 -07:00
442215fe6a
builder: fix layer leak on multi-stage wildcard copy
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 4a18c11bdc1300692def2453c441190d73e1e942
Component: engine
2018-05-30 15:18:40 -07:00
ab001b0599
Merge pull request #37169 from AntaresS/add-version-checking
...
add api version checking for tests from new feature
Upstream-commit: 0a94468a5bed080a77a01847515123b9c2eff62e
Component: engine
2018-05-30 09:58:45 -10:00
285424548c
Move plugin client to separate interface
...
This makes it a bit simpler to remove this interface for v2 plugins
and not break external projects (libnetwork and swarmkit).
Note that before we remove the `Client()` interface from `CompatPlugin`
libnetwork and swarmkit must be updated to explicitly check for the v1
client interface as is done int his PR.
This is just a minor tweak that I realized is needed after trying to
implement the needed changes on libnetwork.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7c77df8acc597cd4f540d873de5fe53a3d414ba9
Component: engine
2018-05-30 15:22:10 -04:00
75e47b0eb6
Merge pull request #36874 from kolyshkin/stop-timeout
...
daemon.ContainerStop(): fix for a negative timeout
Upstream-commit: b85799b63fb25423620ed16e717a99401cd3a39b
Component: engine
2018-05-30 13:38:42 -04:00
231bc963aa
Merge pull request #37017 from cpuguy83/plugins_addr
...
Move plugin client creation to the extension point
Upstream-commit: cbbe0ff5119c7e3480827f57a2210f03152644f7
Component: engine
2018-05-30 09:54:46 -07:00
90dfa0b4ee
Be explicit about github.com prefix being a legacy feature
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: babb0c14fd1281b309de46c3481a5bea88b8031d
Component: engine
2018-05-30 11:09:14 +02:00
f21c0ccd84
Merge pull request #37131 from kolyshkin/top-opt
...
Optimize ContainerTop() aka docker top
Upstream-commit: 65bd038fc5e47ed37d2702cbdd6ce484d320380b
Component: engine
2018-05-30 03:28:07 +02:00
a99e1e1ff6
add api version checking for tests from new feature
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
Upstream-commit: 8ed0fdebe714c64aa697ed7e2187d2233e34eb22
Component: engine
2018-05-29 15:25:33 -07:00
8b1898b015
Merge pull request #37166 from yongtang/05282018-unique-service-name
...
Add `t.Name()` to tests so that service names are unique
Upstream-commit: 864b36255dce627443b18e7e44549d506a71f14a
Component: engine
2018-05-29 12:04:21 +02:00
e9f5618dc0
Merge pull request #37143 from arm64b/copy-after-command-exit
...
Alternative failure mitigation of `TestExecInteractiveStdinClose`
Upstream-commit: 2d7ae3e7e5bebb324be062e5d3f01f489f107285
Component: engine
2018-05-29 12:03:46 +02:00
37672d40d5
Add t.Name() to tests so that service names are unique
...
This fix adds `t.Name()` to tests in integration/network
so that services created in those tests have unique names.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 76195f8047eb9a6be710d53ec493ab97bcf86e20
Component: engine
2018-05-28 22:57:52 +00:00
