toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,385 Commits 3 Branches 295 Tags
70dcc9b7b6cbb6c973d10e7ec681ba85a5ebe95b
Commit Graph
35385 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
John Stephens 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Akihiro Suda 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
Tibor Vass 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
Brian Goff 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
Tonis Tiigi 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
Tonis Tiigi 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
Tibor Vass 30f83012e0 Merge pull request #37355 from tonistiigi/vendor-containerd 
vendor: update containerd to 08f7ee98
Upstream-commit: 68e25cf5263c4348ac470d76d168c4878dbedf71
Component: engine
 2018-06-27 15:08:22 -07:00
Tonis Tiigi 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
Tonis Tiigi 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
Derek McGowan 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
John Howard 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
Tonis Tiigi 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
Vincent Demeester 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
Akihiro Suda 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
Vincent Demeester 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
Lotus Fenn 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
Tonis Tiigi 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
Tonis Tiigi 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
Tonis Tiigi 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
Yuichiro Kaneko 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
Arash Deshmeh 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
Dennis Chen 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
John Howard 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
Sebastiaan van Stijn 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
Anda Xu 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
Sebastiaan van Stijn 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
Vincent Demeester 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
Yong Tang 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
Yong Tang 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
Martin Muzatko 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Arash Deshmeh 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
Tibor Vass 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
Sebastiaan van Stijn 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
Tõnis Tiigi 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
Arash Deshmeh 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
Catalin Pirvu 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
Derek McGowan 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
Brian Goff 89094a295b Merge pull request #37315 from thaJeztah/fix_TestDaemonNoSpaceLeftOnDeviceError 
Fix TestDaemonNoSpaceLeftOnDeviceError
Upstream-commit: 62c6a8f8e5a4d412730af3499c69ac997ab0f4f2
Component: engine
 2018-06-20 08:49:12 -07:00
Brian Goff 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Fabian Raetz 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
Arash Deshmeh 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
Sebastiaan van Stijn 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