Commit graph

35534 commits

Author SHA1 Message Date
Sebastiaan van Stijn
1d7132e3d2
Merge pull request #37356 from Microsoft/jjh/new37316
LCOW: lazycontext: Use correct lstat, fix archive check
2018-06-28 12:32:31 +02:00
Akihiro Suda
37079d66c6
Merge pull request #37357 from dmcgowan/update-containerd-1.1.1-rc.2
Update containerd to v1.1.1-rc.2
2018-06-28 12:41:05 +09:00
Tibor Vass
1436dc8f8d
Merge pull request #37350 from tonistiigi/platform-support
Fix platform struct passing
2018-06-27 19:23:27 -07:00
Brian Goff
c0bc14e8dd Move network conversions out of API router
This stuff doesn't belong here and is causing imports of libnetwork into
the router, which is not what we want.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-06-27 17:11:29 -07:00
Tonis Tiigi
951faaed66 distribution: remove custom matcher code
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-27 15:33:07 -07:00
Tonis Tiigi
f099771665 system: add back lcow validation function
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-27 15:24:26 -07:00
Tibor Vass
68e25cf526
Merge pull request #37355 from tonistiigi/vendor-containerd
vendor: update containerd to 08f7ee98
2018-06-27 15:08:22 -07:00
Tonis Tiigi
0b50d6c315 builder: update platform support to puller
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-27 14:59:36 -07:00
Tonis Tiigi
337ba71fc1 distribution: fix passing platform struct to puller
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-27 14:59:31 -07:00
Derek McGowan
735517928b
Update containerd to v1.1.1-rc.2
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-27 13:49:26 -07:00
John Howard
a5aed699cf LCOW: lazycontext: Use correct lstat, fix archive check
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-06-27 13:29:21 -07:00
Tonis Tiigi
d66615be94 vendor: update containerd to 08f7ee98
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-27 11:59:10 -07:00
Vincent Demeester
bab4c0dff7
Merge pull request #37347 from yui-knk/update_comment
Update comments about `InitRouter`
2018-06-27 13:46:24 +02:00
Akihiro Suda
8f709d8948
Merge pull request #37351 from LotusFenn/unique-names-network-service-test
Use unique names in integration/network/service_test.go
2018-06-27 20:32:20 +09:00
Vincent Demeester
408d317c60
Merge pull request #37298 from adshmh/refactor-network-integration-tests-service-use-network-create
integration/service/network integration tests to use network package
2018-06-27 11:43:04 +02:00
Lotus Fenn
f94c97d320 add unique names to integration/network/service_test.go
Signed-off-by: Lotus Fenn <fenn.lotus@gmail.com>
2018-06-27 00:56:52 -07:00
Tonis Tiigi
81f862a1fe api: fix platform type
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-26 22:59:17 -07:00
Tonis Tiigi
48b93419dc builder: buildkit rebase update
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-26 22:59:17 -07:00
Tonis Tiigi
360d2f2ce7 vendor: update buildkit to cce2080ddb
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-26 22:58:59 -07:00
Yuichiro Kaneko
dbd4c290b7 Update comments about InitRouter
This is a follow-up of commit 408c7ad (PR: #32453)

Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com>
2018-06-27 09:45:06 +09:00
Arash Deshmeh
8b07ec58ea refactored integration/service/network integration tests to use network package
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-06-26 17:18:22 -04:00
Dennis Chen
7f334d3acf Initial support for OCI multi-platform image
Add the OCI spec compatible image support in client side.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2018-06-26 11:39:29 -07:00
John Howard
35193c0e7d LCOW: Auto-select OS
Signed-off-by: John Howard <jhoward@microsoft.com>

Addresses https://github.com/moby/moby/pull/35089#issuecomment-367802698.
This change enables the daemon to automatically select an image under LCOW
that can be used if the API doesn't specify an explicit platform.

For example:

FROM supertest2014/nyan
ADD Dockerfile /

And docker build . will download the linux image (not a multi-manifest image)

And similarly docker pull ubuntu will match linux/amd64
2018-06-26 11:37:43 -07:00
Sebastiaan van Stijn
8e610b2b55
Merge pull request #37249 from AntaresS/add-test-guidline
add integration test guidelines
2018-06-25 20:44:42 +02:00
Anda Xu
2d5ea98b2c add integration test guidelines
Signed-off-by: Anda Xu <anda.xu@docker.com>
2018-06-25 11:40:11 -07:00
Sebastiaan van Stijn
cb37987ee1
Merge pull request #37301 from Mischi/fix-define-self
fix build on OpenBSD by defining Self()
2018-06-25 20:25:38 +02:00
Vincent Demeester
fda9397826
Merge pull request #37337 from yongtang/37331-follow-up
Fix a small spacing issue
2018-06-25 09:24:23 +02:00
Yong Tang
0ed55cd220 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>
2018-06-24 17:27:50 +00:00
Yong Tang
320e4fed22
Merge pull request #37331 from MartinMuzatko/patch-1
Just satisfying my OCD - fixed comment spacing
2018-06-23 10:28:25 -07:00
Martin Muzatko
7015fc03b7 Just satisfying my OCD - fixed comment spacing and removed a hidden character
Signed-off-by: Martin Muzatko <martin@happy-css.com>
2018-06-22 17:17:08 +02:00
Sebastiaan van Stijn
af626ba08a
Merge pull request #37293 from adshmh/migrate-TestNetworkCreateDelete-to-integration
migrate TestAPINetworkCreateDelete from integration-cli/ to integration/
2018-06-21 19:08:08 -07:00
Sebastiaan van Stijn
5828df4e5f
Merge pull request #37264 from adshmh/refactor-inspect-network-integration-tests-use-network-create
refactor network inspect integration tests to use network package
2018-06-21 19:01:24 -07:00
Arash Deshmeh
dda4128c7e refactor network inspect integration tests to use network package
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-06-21 09:44:52 -04:00
Tibor Vass
093424bec0
Merge pull request #37313 from dmcgowan/fix-overlay2-changes
Update overlay2 to use naive diff for changes
2018-06-20 17:16:06 -07:00
Sebastiaan van Stijn
50f87331c6
Merge pull request #37285 from adshmh/refactor-macvlan-integration-tests-network-package
refactored remaining macvlan integration tests to use network package
2018-06-20 16:35:18 -07:00
Tõnis Tiigi
fc806236e5
Merge pull request #37304 from katakonst/fix_flacky_test_serviceget
Fix flaky test TestServiceGet
2018-06-20 16:22:14 -07:00
Arash Deshmeh
1c923b28b8 refactored remaining macvlan integration tests to use network package for creating networks
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-06-20 17:09:26 -04:00
Catalin Pirvu
d6a97b188d Fix flaky test TestServiceGet
Signed-off-by: Catalin Pirvu <pirvu.catalin94@gmail.com>
2018-06-20 22:38:29 +03:00
Derek McGowan
ac5d363e67
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>
2018-06-20 11:07:36 -07:00
Brian Goff
62c6a8f8e5
Merge pull request #37315 from thaJeztah/fix_TestDaemonNoSpaceLeftOnDeviceError
Fix TestDaemonNoSpaceLeftOnDeviceError
2018-06-20 08:49:12 -07:00
Brian Goff
b29a0ab45d
Merge pull request #37312 from thaJeztah/update_containerd_1.1.1.rc1
Update to containerd v1.1.1-rc.1
2018-06-20 08:06:15 -07:00
Nicolas V Castet
47dfff68e4 Whitelist syscalls linked to CAP_SYS_NICE in default seccomp profile
* Update profile to match docker documentation at
  https://docs.docker.com/engine/security/seccomp/

Signed-off-by: Nicolas V Castet <nvcastet@us.ibm.com>
2018-06-20 07:32:08 -05:00
Sebastiaan van Stijn
e2593239d9
Merge pull request #37294 from jstarks/lcow_caps
lcow: Allow the client to adjust capabilities and device cgroup rules
2018-06-19 22:14:07 -07:00
Sebastiaan van Stijn
3dfb26ab3c
Merge pull request #37244 from adshmh/refactor-ipvlan-network-integration-tests-use-network-create
Refactor ipvlan network integration tests to use network package
2018-06-19 17:25:08 -07:00
Sebastiaan van Stijn
754aeb28fd
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>
2018-06-19 16:14:12 -07:00
Sebastiaan van Stijn
83ec91a530
Update to containerd v1.1.1-rc.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-19 10:55:53 -07:00
Fabian Raetz
21537b818d fix build on OpenBSD by defining Self()
Signed-off-by: Fabian Raetz <fabian.raetz@gmail.com>
2018-06-16 19:09:04 +02:00
Arash Deshmeh
6fc9c7e5a9 refactor ipvlan network integration tests to use network.Create
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-06-16 05:11:35 -04:00
Sebastiaan van Stijn
de0abf4315
Merge pull request #37295 from Benjamin28/master
Updated path to be consistent w/ current Windows build process
2018-06-15 18:09:03 -07:00
Sebastiaan van Stijn
59469c63df
Merge pull request #37292 from seemethere/runc
Fix compilation on 32bit machines
2018-06-15 16:30:08 -07:00