32dfa10dbf
Merge pull request #37385 from tonistiigi/update-buildkit
...
vendor: update buildkit to 9acf51e491
Upstream-commit: 4b3df087a222fa34d771137b02348c51d9e107bc
Component: engine
2018-07-03 17:33:54 -07:00
acd7279a5e
vendor: update buildkit to 9acf51e491
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 6144f50e553cf268a4d27cbe774a67b6ab283423
Component: engine
2018-07-03 15:22:39 -07:00
1e9fc972c9
Merge pull request #37368 from tiborvass/buildkit-iidfile
...
builder: return image ID in API when using buildkit
Upstream-commit: 1da7d2eebf0a7a60ce585f89a05cebf7f631019c
Component: engine
2018-07-04 00:20:25 +02:00
642a920980
builder: do not send duplicate status for completed jobs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 6f7dd9428e2134239467815c51aaab85756adb11
Component: engine
2018-07-03 14:47:38 -07:00
2a9011606f
builder: return image ID in API when using buildkit
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: ca8022ec63a9d0e2f9660e2a3455d821abf8f517
Component: engine
2018-07-03 19:11:02 +00:00
5f211d1a2a
Merge pull request #37242 from nvcastet/fix_sys_nice_seccomp
...
Whitelist syscalls linked to CAP_SYS_NICE in default seccomp profile
Upstream-commit: 6273dffbda8928327e8576dc58639edc09fd9c09
Component: engine
2018-07-03 19:23:07 +02:00
ff4ddbf44b
Merge pull request #37371 from ctelfer/bump-libnw-430c00a
...
bump libnetwork to 430c00a
Upstream-commit: dca4cab55d501949b71c58cbd76452e6acfa9243
Component: engine
2018-07-03 19:09:41 +02:00
bd47f635c0
Update documents of dispatchAdd
...
`ADD` does not support git.
Ref: https://github.com/moby/moby/issues/14704#issuecomment-298134333
Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com >
Upstream-commit: 9b374801ac843c3401bfb21d8fd5e205d0bba0d3
Component: engine
2018-07-03 08:51:07 +09:00
a7495f07aa
Merge pull request #37359 from dmcgowan/register-oci-mediatypes
...
Register OCI media types
Upstream-commit: b0e6eedcf4252d56e62fc3de6de5d01e75a3dc44
Component: engine
2018-07-02 14:26:36 +02:00
05cd9e777a
Merge pull request #37374 from haikuoliu/branch_endpoint
...
Pass endpoint to the CloudWatch Logs logging driver
Upstream-commit: 8d1b280a2544c4692b72f80a4265102e111743a4
Component: engine
2018-06-30 11:22:55 +02:00
08169a61e4
Update tests w/ new libnetwork contraints
...
The TestDockerNetworkIPAMMultipleNetworks test allocates several
networks simultaneously with overlapping IP addresses. Libnetwork now
forbids this. Adjust the test case to use distinct IP ranges for the
networks it creates.
Signed-off-by: Chris Telfer <ctelfer@docker.com >
Upstream-commit: efb7909befa0fe2236148543a6d50e2563bf386c
Component: engine
2018-06-29 15:15:52 -04:00
2e315f18e1
Pass endpoint to the CloudWatch Logs logging driver
...
Signed-off-by: haikuoliu <haikuo@amazon.com >
Upstream-commit: 998478d369ad3784c3cd28038d836c3c94b16936
Component: engine
2018-06-29 11:27:37 -07:00
5ed5d1d659
Merge pull request #37369 from johnstep/update-windows-manifest-sorting
...
LCOW: Prefer Windows over Linux in a manifest list
Upstream-commit: a2a3b8fe9cb8a3c9afc11ce27eadebcdb8b40ee5
Component: engine
2018-06-29 09:19:30 -07:00
51cfb2a768
bump libnetwork to 430c00a
...
Bump libnetwork to 430c00a6a6b3dfdd774f21e1abd4ad6b0216c629. This
includes the following moby-affecting changes:
* Update vendoring for go-sockaddr (8df9f31a)
* Fix inconsistent subnet allocation by preventing allocation of
overlapping subnets (8579c5d2)
* Handle IPv6 literals correctly in port bindings (474fcaf4)
* Update vendoring for miekg/dns (8f307ac8)
* Avoid subnet reallocation until required (9756ff7ed)
* Bump libnetwork build to use go version 1.10.2 (603d2c1a)
* Unwrap error type returned by PluginGetter (aacec8e1)
* Update vendored components to match moby (d768021dd)
* Add retry field to cluster-peers probe (dbbd06a7)
* Fix net driver response loss on createEndpoint (1ab6e506)
(fixes https://github.com/docker/for-linux/issues/348 )
Signed-off-by: Chris Telfer <ctelfer@docker.com >
Upstream-commit: f155f828a26cfb3ee0dd8ca48bd2c702c9032b0b
Component: engine
2018-06-29 11:03:20 -04:00
adf7112b0e
Re-add support for a custom .bashrc file in build env
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f2c5857612309330a559500181ce454309ae3c1c
Component: engine
2018-06-29 12:39:36 +02:00
d8b529a6bf
Merge pull request #37364 from thaJeztah/bump_go_winio
...
Update Microsoft/go-winio to 0.4.8
Upstream-commit: 26becc002c406082a29f27462d322aee1162ab22
Component: engine
2018-06-29 09:01:13 +02:00
70dcc9b7b6
LCOW: Prefer Windows over Linux in a manifest list
...
When a manifest list contains both Linux and Windows images, always
prefer Windows when the platform OS is unspecified. Also, filter out any
Windows images with a higher build than the host, since they cannot run.
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: ddcdb7255d960a4b2049439245a4f887b26af891
Component: engine
2018-06-28 20:30:41 -07:00
0f65f24d01
Register OCI image media types
...
OCI types are backwards compatible with Docker manifest
types, however the media types must be registered.
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: c4f0515837b834ec66ec463d92a32015062a0804
Component: engine
2018-06-28 18:19:15 -07:00
e6f427396a
Merge pull request #37156 from cpuguy83/networking_api_types_only
...
Move network conversions out of API router
Upstream-commit: d912e9460e287238f879de791595193543ab2202
Component: engine
2018-06-29 02:47:27 +02:00
f83b2543cd
Update Microsoft/go-winio to 0.4.8
...
Fixes named pipe support for hyper-v isolated containers
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 74095588baa0693a2c07bd05c001c42830f82ed3
Component: engine
2018-06-28 18:55:45 +02:00
b3ce456eca
Merge pull request #37356 from Microsoft/jjh/new37316
...
LCOW: lazycontext: Use correct lstat, fix archive check
Upstream-commit: 1d7132e3d2d91168153db529b8900fb6e53aea92
Component: engine
2018-06-28 12:32:31 +02:00
2ae84e99a1
Merge pull request #37357 from dmcgowan/update-containerd-1.1.1-rc.2
...
Update containerd to v1.1.1-rc.2
Upstream-commit: 37079d66c65d78da66b963315c9102ce67a1d685
Component: engine
2018-06-28 12:41:05 +09:00
b30a6b365b
Merge pull request #37350 from tonistiigi/platform-support
...
Fix platform struct passing
Upstream-commit: 1436dc8f8d0f6f60b6e335fbd918d6b22ee6574d
Component: engine
2018-06-27 19:23:27 -07:00
d86ac0bd5d
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 >
Upstream-commit: c0bc14e8dd5a31f5edc804e9a1347bb3eb44483e
Component: engine
2018-06-27 17:11:29 -07:00
1a09169ca0
distribution: remove custom matcher code
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 951faaed664dd51d2aacfdb782534f4c46bd9e23
Component: engine
2018-06-27 15:33:07 -07:00
d2c785277a
system: add back lcow validation function
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f0997716651b6e6c2b07e3d514bf8452114a1433
Component: engine
2018-06-27 15:24:26 -07:00
c377af1d4d
builder: update platform support to puller
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0b50d6c315a41025de98617bd6cc79c3925838d5
Component: engine
2018-06-27 14:59:36 -07:00
b67a507422
distribution: fix passing platform struct to puller
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 337ba71fc1124603302e28d94e2f08674e31a756
Component: engine
2018-06-27 14:59:31 -07:00
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
fbe0a9291a
LCOW: lazycontext: Use correct lstat, fix archive check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a5aed699cfaa4d84b1b134033fb468b3a7a874f0
Component: engine
2018-06-27 13:29:21 -07:00
86aefcafc8
vendor: update containerd to 08f7ee98
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: d66615be94d548c1d102006a477c3abbaff93274
Component: engine
2018-06-27 11:59:10 -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
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
28ca1b95b2
api: fix platform type
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 81f862a1fe6f24fea70b1278a4292eefc4029a03
Component: engine
2018-06-26 22:59:17 -07:00
23cd5508d9
builder: buildkit rebase update
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 48b93419dcc3dc71584d674f045c30793b890395
Component: engine
2018-06-26 22:59:17 -07:00
ebe6026bac
vendor: update buildkit to cce2080ddb
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 360d2f2ce7cba28fc5427bc346ea37aee7fe78f6
Component: engine
2018-06-26 22:58:59 -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
0c25b296c2
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 >
Upstream-commit: 7f334d3acfd7bfde900e16e393662587b9ff74a1
Component: engine
2018-06-26 11:39:29 -07:00
758ffaf745
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
Upstream-commit: 35193c0e7dc301e1d2f6ea96e0ce34ffd2d4b88d
Component: engine
2018-06-26 11:37:43 -07: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
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
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
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