p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,816 Commits 2 Branches 295 Tags
35ae1fc05c63ee8aab49689faa44bbde0befdb6e
Commit Graph

479 Commits

Author SHA1 Message Date
Andrew Hsu
35ae1fc05c Merge pull request #130 from thaJeztah/18.09_backport_fix_api_return_code 
[18.09 backport] API: fix status code on conflicting service names
Upstream-commit: 42b58273f68c8240e25f1642e6add6435b894e87
Component: engine
 2018-12-13 10:54:52 +00:00
Andrew Hsu
b412443ed2 Merge pull request #131 from tonistiigi/1809-update-buildkit 
[18.09 backport] vendor: update buildkit to d9f75920
Upstream-commit: d21754a3fb453451c521ddc51df6cf109102d74c
Component: engine
 2018-12-10 16:29:04 +00:00
Tonis Tiigi
e27956be04 vendor: update buildkit to d9f75920 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 32f48058158cce7a6a1f8f0d1526d8224b369cbc)
Upstream-commit: 43dedf397503532f8bc1313af82a9356ed8c3550
Component: engine
 2018-12-10 13:03:13 +00:00
Sebastiaan van Stijn
c99df606e6 Update swarmkit to return correct error-codes on conflicting names 
This updates the swarmkit vendoring to the latest version in the bump_v18.09
branch

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ad7105260f3c2ff32a375ff78dce9a96e01d87cb
Component: engine
 2018-12-10 12:18:32 +01:00
Andrew Hsu
42b5bd7c0f vndr libnetwork to adjust for updated runc 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 75c4b741550a3c5cb061269cc92a5d563d153626)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5cd4797c89383159219716de92775138c2dd17c5
Component: engine
 2018-12-07 18:57:54 +01:00
Andrew Hsu
9f0f7c271c update containerd to v1.2.1 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 615eecf8ac2a49385e346631e97850830360b8cf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7dfd23acf1d604cde70d46e36bfe2e51df2dcf46
Component: engine
 2018-12-07 18:45:14 +01:00
Andrew Hsu
2eb0feaf2d Merge pull request #107 from thaJeztah/18.09_backport_bump_libnetwork 
[18.09 backport] update libnetwork to fix iptables compatibility on debian
Upstream-commit: 61a250fd23db8cee48403e3d9de5de100470bd03
Component: engine
 2018-11-27 09:55:12 -08:00
Andrew Hsu
f10a3615ef Merge pull request #121 from thaJeztah/18.09_backport_containerd_v1.2.1 
[18.09 backport] Update containerd to v1.2.1-rc.0
Upstream-commit: c95cf2a5d36b5448e4771a29f2ad72214a2311dd
Component: engine
 2018-11-27 09:15:48 -08:00
Tonis Tiigi
71bb7e098b vendor: update buildkit to v0.3.3 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 6204eb064561ba03ba9143d2b29d86836b2093d9)
Upstream-commit: 850fff5fc7f033e76ef0eec04eb98384ddf2065d
Component: engine
 2018-11-21 14:10:01 -08:00
Sebastiaan van Stijn
9baf0f2b61 Update containerd to v1.2.1-rc.0 
The previous update used a commit from master. Now that
all the fixes are backported to the containerd 1.2 release
branch, we can switch back to that branch.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2fb5de68a9bd05b1dbf3ae3f7ae82bcd5e64dc5c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: db7f375d6a2aaf6d79f5c690e2f302c640bdde04
Component: engine
 2018-11-21 21:59:41 +01:00
Michael Crosby
9a2dacb99c wip: bump containerd and runc version 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit d13528c6350a4b359a7b8dc9a8a7bcba12a3c1a8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7d6ec38402f4e2a5e1c83a981a88bf1a5f202858
Component: engine
 2018-11-21 21:59:33 +01:00
Kir Kolyshkin
fd839bc749 Bump runc 
Changes: a00bf01908...9f1e94488e

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 335736fb0167a31a00cf2967c181a565c61334be)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5b8cee93b5b6a2449d9af225e17d85c612f64ed2
Component: engine
 2018-11-12 15:51:44 +01:00
Sebastiaan van Stijn
e2c5b23d49 [18.09 backport] update libnetwork to fix iptables compatibility on debian 
Fixes a compatibility issue on recent debian versions, where iptables now uses
nft by default.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e1783a72d1b84bc3e32470c468d14445e5fba8db
Component: engine
 2018-11-06 12:39:04 +01:00
Sebastiaan van Stijn
90250502de update containerd client and dependencies to v1.2.0 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit dd7799afd40b74e538af01fc658c861d225a4b82)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c27094289aadaad4ad4d78aefcc44e95278d3508
Component: engine
 2018-11-06 11:03:22 +01:00
Akihiro Suda
02673c7372 bump up runc 
Changes: 69663f0bd4...a00bf01908

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit 275044bbc374b563a2039229660df58a75bdc9f3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0afe0309bd9580bc76496c9e0da75216795c1c01
Component: engine
 2018-11-06 11:03:14 +01:00
John Howard
3d605988c4 Vendor Microsoft/hcsshim @ v0.7.9 
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit d03ab106624ebc30b69080d0092702ad1fe1285c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 41f3cea42f2f45244051b7f829c0ef9c27383c26
Component: engine
 2018-11-06 11:03:06 +01:00
Anshul Pundir
ccef7c659b [18.09] Vendor swarmkit to 6186e40fb04a7681e25a9101dbc7418c37ef0c8b 
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
Upstream-commit: 46dfcd83bf1bb820840df91629c04c47b32d1e21
Component: engine
 2018-10-31 16:04:51 -07:00
Drew Erny
7d67a90c9e Bump swarmkit 
Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 1222a7081ac9ebb0830a6c8008142258c49800b5
Component: engine
 2018-10-22 15:10:20 -05:00
Chris Telfer
d5fc44041a Bump libnetwork to 6da50d19 for DSR changes 
Bump libnetwork to 6da50d1978302f04c3e2089e29112ea24812f05b which
is the current tip of libnetwork's bump_18.09 branch to get the DSR load
balancing mode option changes for the 18.09 branch of Docker CE.

Signed-off-by: Chris Telfer <ctelfer@docker.com>
Upstream-commit: fd1fe0b702571865cc77d66937e4ca570b5b9cc3
Component: engine
 2018-10-18 10:52:57 -04:00
Andrew Hsu
4c92b55e3f Merge pull request #83 from thaJeztah/18.09_backport_bump_buildkit 
[18.09 backport] bump buildkit to c7bb575343df0cbfeab8b5b28149630b8153fcc6
Upstream-commit: b811212ccdbfd752675de1161e59ca194c798da4
Component: engine
 2018-10-12 10:43:01 -07:00
Sebastiaan van Stijn
127d4b5bad bump buildkit to c7bb575343df0cbfeab8b5b28149630b8153fcc6 
Relevant changes:

- buildkit#667 gateway: check for `ReadDir` and `StatFile` caps on client side
- buildkit#668 dockerfile: fix ssh required option
- buildkit#669 dockerfile: update default copy image
- buildkit#670 solver: specify SSH key ID in error message when required key was not forwarded
- buildkit#673 solver: fix possible nil dereference
- buildkit#672 fix setting uncompressed label on content
- buildkit#680 dockerfile: fix empty dest directory panic

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9cfce302145a493571df138888485999cd6172ce)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f58f8421433d18e0fb9a51567068a2ddc1b13a1b
Component: engine
 2018-10-11 21:55:49 +02:00
Akihiro Suda
681595daf2 bump up buildkit 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit 837b9c6214cd43828473d15175b0a3c6e1db8507)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 90c72824c36369efd8be52bedd731d12b3415508
Component: engine
 2018-10-11 03:01:18 +09:00
Sebastiaan van Stijn
8074d84ff1 Update containerd client and dependencies to v1.2.0-rc.1 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit dd622c81a4ea8f4e625f03ee9f13ad47b8746638)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 148d9f0e58bc180fefffcfc0a9e7a00b4276a67a
Component: engine
 2018-10-05 14:53:33 +02:00
Sebastiaan van Stijn
8be1c880ff Update containerd dependencies 
This updates the containerd dependencies to match
the versions used by the vendored containerd version

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 31a9c9e79101cdf38d383104afbc1b48ede75291)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5070e418b806cc96ad0f5b3ac32c8d416ff8449a
Component: engine
 2018-10-05 14:38:34 +02:00
Tibor Vass
f4dc4cdbaa vendor buildkit to 8f4dff0d16ea91cb43315d5f5aa4b27f4fe4e1f2 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit e161a8d1e9e84f50410860d903205e6d2dc86110)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 67541d5841e645f3408b01f189ec4339df449edc
Component: engine
 2018-09-27 22:46:57 +00:00
Tibor Vass
47296e79f8 vendor: remove boltdb dependency which is superseded by bbolt 
This also brings in these PRs from swarmkit:
- https://github.com/docker/swarmkit/pull/2691
- https://github.com/docker/swarmkit/pull/2744
- https://github.com/docker/swarmkit/pull/2732
- https://github.com/docker/swarmkit/pull/2729
- https://github.com/docker/swarmkit/pull/2748

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: cce1763d57b5c8fc446b0863517bb5313e7e53be
Component: engine
 2018-09-22 01:24:11 +00:00
Tibor Vass
f3dec68e23 builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit d0f00bc1fb2c349ad72ecc2394b8474937de84dd)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 3d67dd046539f8e04db82ce07ea56f97b832676b
Component: engine
 2018-09-21 17:06:25 -07:00
Anda Xu
b69d4cb4ec update vendor 
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 308701fac6f716160283ca0868da59aba2ea7eb5)
(cherry picked from commit b48afc216f46c8e786560b807528699012e1627b)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b73fd4d936864998451cdd37f45694541e43006e
Component: engine
 2018-09-21 17:06:25 -07:00
Anda Xu
15caa5031e update vendor 
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 54b3af4c7d7d625b9cff6d5d7b8730ec99f38977)
Upstream-commit: ee40a9ebcda2f46ea731ac1e2f840a2a23be0a07
Component: engine
 2018-09-13 16:42:13 -07:00
Kir Kolyshkin
f75eb8f2a7 vendor: update tar-split 
To include https://github.com/vbatts/tar-split/pull/48 which
fixes the issue of creating an image with >8GB file in it.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 92e75439037d205c218208945c70cfb3633e87aa)
Upstream-commit: d7085abec2e445630bedd3e79782c5ec33f62682
Component: engine
 2018-09-06 17:24:39 -07:00
Tibor Vass
90b4f8c14c vendor buildkit to fix a couple of bugs 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit effa24bf48170f141cd9e1c1fcb5d39aedf1ca74)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 4c35d811471b80eec10476050b1222b653e6c5d9
Component: engine
 2018-09-04 15:52:24 +00:00
Tibor Vass
cb322aa233 builder: fix bridge networking when using buildkit 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit dc7e472db986fa3c07806f56e82db756c47567fb)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 1d531ff64f99e07ac8733894416de8212a6c7278
Component: engine
 2018-08-23 05:32:51 +00:00
Tibor Vass
ebad0ccbe4 builder: temporarily disable bridge networking when using buildkit 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 16084ea8c82fe3b3a0aae2573def0d1857365408
Component: engine
 2018-08-22 03:29:17 +00:00
Tibor Vass
e4dc477de6 Merge pull request #37558 from selansen/master 
Global Default Address Pool feature support
Upstream-commit: 1800883bd16664846db1572b8c8fbe8c85892cee
Component: engine
 2018-08-20 18:15:44 -07:00
selansen
c9c36cf7eb Global Default Address Pool feature support 
This feature allows user to specify list of subnets for global
default address pool. User can configure subnet list using
'swarm init' command. Daemon passes the information to swarmkit.
We validate the information in swarmkit, then store it in cluster
object. when IPAM init is called, we pass subnet list to IPAM driver.

Signed-off-by: selansen <elango.siva@docker.com>
Upstream-commit: f7ad95cab9cc7ba8925673a933028d53284c13f5
Component: engine
 2018-08-20 15:07:08 -04:00
Tonis Tiigi
560eea56b4 vendor: update buildkit to 46f9075a 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: bc67a7886273ad8cc270e9c6792c787e0cf7745e
Component: engine
 2018-08-20 18:54:10 +00:00
Sebastiaan van Stijn
a50883aec2 Merge pull request #37664 from dmcgowan/vendor-containerd-1.2 
Update containerd vendor to 1.2 beta
Upstream-commit: 7d4fa69e33e64cf637d6fb3a0130e8aa3cc83072
Component: engine
 2018-08-18 22:22:41 +01:00
Derek McGowan
0d4c43ea08 Update containerd vendor to 1.2 beta 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 98e23f2a8ef5703861eb98bf78c0354f2ece8c0f
Component: engine
 2018-08-17 13:08:22 -07:00
Andrew Hsu
dfe2d66f01 vndr go-connections to v0.4.0 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 626c097f8c29bf432e5465a961496bf41aa74cad
Component: engine
 2018-08-16 23:46:53 +00:00
Tibor Vass
71cb67c2af Merge pull request #37582 from andrewhsu/bk 
vndr containerd to a88b631, buildkit to e57eed4, and fsutil to b19464c
Upstream-commit: a3e78ca0c6a1a20c5ffeeaa51e3e0b4ff623a464
Component: engine
 2018-08-08 10:55:19 -07:00
Sebastiaan van Stijn
a972373b51 Bump SwarmKit to 8852e8840e30d69db0b39a4a3d6447362e17c64f 
Relevant changes;

- swarmkit #2593 agent: return error when failing to apply network key
- swarmkit #2645 Replace deprecated grpc functions
- swarmkit #2720 Test if error is nil before to log it
- swarmkit #2712 [orchestrator] Fix task sorting
- swarmkit #2677 [manager/orchestrator/reaper] Fix the condition used for skipping over running tasks

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 660fa129c0ea09c1aa1770b5f2d26ec762213484
Component: engine
 2018-08-03 18:55:53 +02:00
Andrew Hsu
4658043fcf vndr buildkit to e57eed4 and fsutil to b19464c 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 67da8c84b66a79261032478637b26c5baa3908b4
Component: engine
 2018-08-02 18:19:13 +00:00
Sebastiaan van Stijn
b6bdcc10a5 Merge pull request #37485 from fcrisciani/resolv 
Systemd-resolved proper handling
Upstream-commit: e1584514c15f6ad91b9ef5bc530a1eef46f18267
Component: engine
 2018-08-01 14:52:33 +02:00
Vincent Demeester
14dcb25448 Bump a bunch of dependencies to more recent versions 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b0d108aa6ba4a52db1dd2bba0fd512903ab725ca
Component: engine
 2018-08-01 10:37:27 +02:00
Vincent Demeester
0f058dae99 Bump mergo to v0.3.6 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a550b0ae475ebbfcffe92d9bf40734f5b3de2f7e
Component: engine
 2018-07-31 10:03:43 +02:00
Sebastiaan van Stijn
c3d8713381 Merge pull request #37514 from jterry75/linux_metadata 
Adds LinuxMetadata support by default on Windows
Upstream-commit: 13a8031e1c8593e820f20edc713c89dbe65cee3b
Component: engine
 2018-07-27 17:51:10 +01:00
Flavio Crisciani
d481c9e35d Vendor libnetwork 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: fc4ebe0b8bc5e41b3b2d108c21dc19ea08a9fcb7
Component: engine
 2018-07-26 11:17:56 -07:00
Flavio Crisciani
1fb6cc9e1e Add a way to get a pid of a process 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: 0fc52ca6dd628f2b9163f5d328d1d749c6708de4
Component: engine
 2018-07-26 11:17:46 -07:00
Sebastiaan van Stijn
7307ff9185 Merge pull request #37515 from Microsoft/jjh/revendoropengcs 
Revendor Microsoft/opengcs @ v0.3.8
Upstream-commit: 6f8d85c441be3943eaa82d01430b39b90261d20c
Component: engine
 2018-07-25 23:41:10 +02:00
John Howard (VM)
fd8de2c620 Revendor Microsoft/opengcs @ v0.3.8 
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
Upstream-commit: 25aaf9772bbef81ee6557d23f37ac69f988d1050
Component: engine
 2018-07-23 10:45:24 -07:00