052d68f05c
Update containerd to v1.1.1-rc.2
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: 735517928b3c0a9dabdc087b1b2f366d72df3f4e
Component: engine
2018-06-27 13:49:26 -07:00
2c564f1c70
Merge pull request #37347 from yui-knk/update_comment
...
Update comments about `InitRouter`
Upstream-commit: bab4c0dff73dc38d551ab1a1fdadcbd2757154e7
Component: engine
2018-06-27 13:46:24 +02:00
b383c8f747
Merge pull request #37351 from LotusFenn/unique-names-network-service-test
...
Use unique names in integration/network/service_test.go
Upstream-commit: 8f709d894811ec22b621a77fcc0e69476318d7f2
Component: engine
2018-06-27 20:32:20 +09:00
434a544ab5
Merge pull request #37298 from adshmh/refactor-network-integration-tests-service-use-network-create
...
integration/service/network integration tests to use network package
Upstream-commit: 408d317c6008e3d81912a81c3ea96d3f606cf210
Component: engine
2018-06-27 11:43:04 +02:00
bc8dee16e5
add unique names to integration/network/service_test.go
...
Signed-off-by: Lotus Fenn <fenn.lotus@gmail.com >
Upstream-commit: f94c97d3200ec11762fc3fb3c2eafd5866ffa976
Component: engine
2018-06-27 00:56:52 -07:00
f402d858a8
Update comments about InitRouter
...
This is a follow-up of commit 408c7ad (PR: #32453 )
Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com >
Upstream-commit: dbd4c290b7029d31fa69c906a8da864589f19e09
Component: engine
2018-06-27 09:45:06 +09:00
840124a196
refactored integration/service/network integration tests to use network package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 8b07ec58ea5792f906c006edc5db9f37c7a570de
Component: engine
2018-06-26 17:18:22 -04:00
f0140f8d7c
Merge pull request #37249 from AntaresS/add-test-guidline
...
add integration test guidelines
Upstream-commit: 8e610b2b55bfd1bfa9436ab110d311f5e8a74dcb
Component: engine
2018-06-25 20:44:42 +02:00
0278df1cff
add integration test guidelines
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
Upstream-commit: 2d5ea98b2c2223e97627aa0d03e68c3f84e3b662
Component: engine
2018-06-25 11:40:11 -07:00
c7d47a1863
Merge pull request #37301 from Mischi/fix-define-self
...
fix build on OpenBSD by defining Self()
Upstream-commit: cb37987ee11655ed6bbef663d245e55922354c68
Component: engine
2018-06-25 20:25:38 +02:00
135541dc2f
Merge pull request #37337 from yongtang/37331-follow-up
...
Fix a small spacing issue
Upstream-commit: fda9397826dcb51b4e2fdc4bc1f8ce61fba7d884
Component: engine
2018-06-25 09:24:23 +02:00
6cedb2b4cc
Fix a small spacing issue
...
As a follow up to https://github.com/moby/moby/pull/37331#pullrequestreview-131411625
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 0ed55cd22071a9530feb2ea711cffdfa94e559d8
Component: engine
2018-06-24 17:27:50 +00:00
327777461f
Merge pull request #37331 from MartinMuzatko/patch-1
...
Just satisfying my OCD - fixed comment spacing
Upstream-commit: 320e4fed2258ba9eea97f2e0b8a4e08d835bb080
Component: engine
2018-06-23 10:28:25 -07:00
e4b46b89eb
Just satisfying my OCD - fixed comment spacing and removed a hidden character
...
Signed-off-by: Martin Muzatko <martin@happy-css.com >
Upstream-commit: 7015fc03b72655e9484e68b4ec64b5fca80c68a0
Component: engine
2018-06-22 17:17:08 +02:00
3c9ebe0c45
Merge pull request #37293 from adshmh/migrate-TestNetworkCreateDelete-to-integration
...
migrate TestAPINetworkCreateDelete from integration-cli/ to integration/
Upstream-commit: af626ba08a4e11b0e140e7512ac2740b09833c29
Component: engine
2018-06-21 19:08:08 -07:00
58835a016b
Merge pull request #37264 from adshmh/refactor-inspect-network-integration-tests-use-network-create
...
refactor network inspect integration tests to use network package
Upstream-commit: 5828df4e5fc325f872eaf33c21e28da41a3306a5
Component: engine
2018-06-21 19:01:24 -07:00
28ecd8f494
refactor network inspect integration tests to use network package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: dda4128c7ea6df5565e4ad3c0f0958a0aad547da
Component: engine
2018-06-21 09:44:52 -04:00
a83c18a0ef
Merge pull request #37313 from dmcgowan/fix-overlay2-changes
...
Update overlay2 to use naive diff for changes
Upstream-commit: 093424bec097cdf51154255226cf999d6824633b
Component: engine
2018-06-20 17:16:06 -07:00
198a405d97
Merge pull request #37285 from adshmh/refactor-macvlan-integration-tests-network-package
...
refactored remaining macvlan integration tests to use network package
Upstream-commit: 50f87331c6ea5c0ddb103bb8ab96ca26b87d61ef
Component: engine
2018-06-20 16:35:18 -07:00
e14292d034
Merge pull request #37304 from katakonst/fix_flacky_test_serviceget
...
Fix flaky test TestServiceGet
Upstream-commit: fc806236e507194289eeb6a3020580de33988a24
Component: engine
2018-06-20 16:22:14 -07:00
d5c5d1c094
refactored remaining macvlan integration tests to use network package for creating networks
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 1c923b28b81f22023ca8c562d359b9136efb93eb
Component: engine
2018-06-20 17:09:26 -04:00
dd4bb57e39
Fix flaky test TestServiceGet
...
Signed-off-by: Catalin Pirvu <pirvu.catalin94@gmail.com >
Upstream-commit: d6a97b188da2409f562a395e6c1656d68b161494
Component: engine
2018-06-20 22:38:29 +03:00
775daf1b72
Update overlay2 to use naive diff for changes
...
The archive changes function is not implemented correctly
to handle opaque directories.
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: ac5d363e67e01c769b4d9e20ed76a278434ee4de
Component: engine
2018-06-20 11:07:36 -07:00
89094a295b
Merge pull request #37315 from thaJeztah/fix_TestDaemonNoSpaceLeftOnDeviceError
...
Fix TestDaemonNoSpaceLeftOnDeviceError
Upstream-commit: 62c6a8f8e5a4d412730af3499c69ac997ab0f4f2
Component: engine
2018-06-20 08:49:12 -07:00
b71fba1e62
Merge pull request #37312 from thaJeztah/update_containerd_1.1.1.rc1
...
Update to containerd v1.1.1-rc.1
Upstream-commit: b29a0ab45d5690f88d244333973959d8e680f820
Component: engine
2018-06-20 08:06:15 -07:00
480ebf9169
Merge pull request #37294 from jstarks/lcow_caps
...
lcow: Allow the client to adjust capabilities and device cgroup rules
Upstream-commit: e2593239d949eee454935daea7a5fe025477322f
Component: engine
2018-06-19 22:14:07 -07:00
b774296769
Merge pull request #37244 from adshmh/refactor-ipvlan-network-integration-tests-use-network-create
...
Refactor ipvlan network integration tests to use network package
Upstream-commit: 3dfb26ab3cbf961298f8ce3f94659b5fe4146ceb
Component: engine
2018-06-19 17:25:08 -07:00
e1cb6f43e5
Fix TestDaemonNoSpaceLeftOnDeviceError
...
This test is testing if any "no space left on device" errors
that occur during `docker pull` will not be masked by other
errors. To test for this, a new loopback-device was created,
and used as `--data-dir` ("/var/lib/docker").
However, `/var/lib/docker` is used for storing various
other things, including a `cache.db` database, used by
BuildKit, which is created during startup of the daemon.
Creation of that file failed (due to `--data-dir` path
being on a mount with limited size), which caused daemon
start to fail before the test was able to run.
This patch changes the size-limited mount to be used for
the storage-driver directory only, so that the test is
not affected by other parts of the code attempting to
write files in it.
To have a predictable path; the daemon used in this test
is configured to use the `vfs` storage-driver.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 754aeb28fdb9dd3aafb7705224e57f28281db264
Component: engine
2018-06-19 16:14:12 -07:00
d6e8349fd4
Update to containerd v1.1.1-rc.1
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 83ec91a530f3884e685c197e60091c210162f02a
Component: engine
2018-06-19 10:55:53 -07:00
c62d7149f1
fix build on OpenBSD by defining Self()
...
Signed-off-by: Fabian Raetz <fabian.raetz@gmail.com >
Upstream-commit: 21537b818de5e4167c5a3856c25b9b06cf16d87d
Component: engine
2018-06-16 19:09:04 +02:00
f8d73bea7c
refactor ipvlan network integration tests to use network.Create
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 6fc9c7e5a9af409da932dfcd0847eaaf0e583111
Component: engine
2018-06-16 05:11:35 -04:00
3ead1493a1
Merge pull request #37295 from Benjamin28/master
...
Updated path to be consistent w/ current Windows build process
Upstream-commit: de0abf4315fd1d737aedc2e9f410c8125ad1a7fc
Component: engine
2018-06-15 18:09:03 -07:00
5379f9201a
Merge pull request #37292 from seemethere/runc
...
Fix compilation on 32bit machines
Upstream-commit: 59469c63dfe351eacd29a57e84abf8ee5eeb5948
Component: engine
2018-06-15 16:30:08 -07:00
92efea70f8
lcow: Allow the client to add device cgroup rules
...
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: e9268d96420227550998212789f7058afc297de9
Component: engine
2018-06-15 16:14:17 -07:00
ccb4f79c21
lcow: Allow the client to add or remove capabilities
...
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 349aeeab7c5e878ddc6c0c95a0a937476816c43e
Component: engine
2018-06-15 16:03:33 -07:00
330d020ac3
Updated path to be consistent w/ current Windows build process
...
Signed-off-by: Benjamin Baker <Benjamin.baker@utexas.edu >
Upstream-commit: 5122aaf26fdbb68e02cd31baf4a172f1210e49b5
Component: engine
2018-06-15 19:02:53 -04:00
4abb04c090
Fix compilation on 32 bit systems
...
* Update runc commit to ad0f525
* Update buildkit to dbf67a6
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: c5ce4cf654b6cd6402957bd7c7570dd4fac1b902
Component: engine
2018-06-15 20:41:03 +00:00
79590fda36
migrate TestAPINetworkCreateDelete from integration-cli/ to integration/
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: f5426214295cb59d54ece5a24d4720e31947981b
Component: engine
2018-06-15 16:06:45 -04:00
1c5329a0c5
Merge pull request #37279 from adshmh/refactor-service-create-integration-tests-use-network-create
...
Create service integration tests use network package
Upstream-commit: 3f405c48fff297ae6ddeed58363b904d2d8e94f9
Component: engine
2018-06-14 12:57:48 +02:00
a21fe6fe56
Merge pull request #37280 from Microsoft/jjh/fixbuildersources
...
Don't fail to start daemon if builder source is not available
Upstream-commit: d17b78bdfeceeedcc6addc470215d11b4f870960
Component: engine
2018-06-13 22:29:08 -07:00
a53be8bf33
Merge pull request #37270 from adshmh/refactor-service-network-integration-tests-use-network-create
...
refactored service network integration tests to use the network package
Upstream-commit: d3d58b68c628edd138f3956614bffccfe81814a4
Component: engine
2018-06-13 13:11:31 -07:00
1eb0321c55
Merge pull request #37276 from yui-knk/fix_anchor
...
Fix link anchors in CONTRIBUTING.md
Upstream-commit: 64b4936ca9e13d6e3c1327bf3145eadc258c556c
Component: engine
2018-06-13 13:09:59 -07:00
89a8d08125
Don't fail to start daemon if builder source is not available
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ca3e3fcf7e66554d20acd990a506d6ee5e368ca1
Component: engine
2018-06-13 09:33:19 -07:00
7cdcffc8da
create service integration tests use network package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: ad46a1f5e7e82b882390c2974a52faa06c5b8cb2
Component: engine
2018-06-13 12:10:02 -04:00
2d48a7f46a
Merge pull request #37243 from vdemeester/gotestyourself-with-tools
...
Update gotestyourself to gotest.tools
Upstream-commit: 692df4699c3dcbe4645e9b90cc40091b1f2519d4
Component: engine
2018-06-13 16:23:26 +02:00
2e5e9bbe35
Fix link anchors in CONTRIBUTING.md
...
This is a follow up of #35168 .
Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com >
Upstream-commit: 7b3966245de27b753c6acfe0347833811ed9eed8
Component: engine
2018-06-13 21:58:48 +09:00
4cadaa03f8
Update tests to use gotest.tools 👼
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 38457285242e57306c5b7ee652c7ccbb9fbd6713
Component: engine
2018-06-13 09:04:30 +02:00
9b920fd3e1
Replace gotestyourself by gotest.tools
...
github.com/gotestyourself/gotestyourself moved to gotest.tools with
version 2.0.0. Moving to that one, bumping it to v2.1.0.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c147e9e1a45b1c66bc5773814b53bcd27132557c
Component: engine
2018-06-13 09:04:03 +02:00
e027a9c59e
Merge pull request #37151 from tonistiigi/experimental-buildkit
...
Experimental BuildKit support
Upstream-commit: c752b0991e31ba9869ab6a0661af57e9423874fb
Component: engine
2018-06-12 13:31:48 -07:00
2ba3b58b47
refactored network integration tests under integration/network/service_test.go to use network package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 694047183a9f72b3b2b45ef09f27dc0776fa3e10
Component: engine
2018-06-12 14:31:01 -04:00