Commit graph

693 commits

Author SHA1 Message Date
Sebastiaan van Stijn
87558ad4dd
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>
2018-11-01 02:47:28 +01:00
Sebastiaan van Stijn
1527a67212
Merge pull request #37999 from Microsoft/jjh/tar2vhd
LCOW: ApplyDiff() use tar2ext4, not SVM
2018-10-24 22:35:34 +02:00
Anshul Pundir
93e1c5a5b7 Vendor swarmkit to a84c01f49091167dd086c26b45dc18b38d52e4d9.
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
2018-10-17 16:33:35 -07:00
Vincent Demeester
4c3926a997
Merge pull request #38048 from AkihiroSuda/runc-20181016
bump up runc
2018-10-16 18:29:46 +02:00
Akihiro Suda
06646dc9b4
Merge pull request #38024 from thaJeztah/bump_swarmkit
Bump swarmkit to 7d5d33b97794440462a04acdd3f31914da8f66f3
2018-10-16 19:32:29 +09:00
Akihiro Suda
275044bbc3 bump up runc
Changes: 69663f0bd4...a00bf01908

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-10-16 14:31:19 +09:00
Flavio Crisciani
e143b8fa4e
Vendor libnetwork
- DSR support for linux
- increase max DNS pending query from 100->1024
- DNs to handle NXDOMAIN, REFUSED

diff:
20461b8539...d7b61745d1

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-10-12 08:44:48 -07:00
Sebastiaan van Stijn
8dedcb8c51
Bump swarmkit to 7d5d33b97794440462a04acdd3f31914da8f66f3
Relevant changes;

- swarmkit#2681 Handle an edge case in CA rotation where we reclaim CA service from an external CA
- swarmkit#2750 Use gometalinter; switch from x/net/context -> context

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-10-11 23:03:18 +02:00
Sebastiaan van Stijn
9cfce30214
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>
2018-10-11 21:48:26 +02:00
John Howard
d03ab10662 Vendor Microsoft/hcsshim @ v0.7.9
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-10-09 18:15:59 -07:00
Tibor Vass
5fae0ddb2b
Merge pull request #37973 from AkihiroSuda/bk20181005
bump up buildkit
2018-10-05 15:09:41 -07:00
Akihiro Suda
837b9c6214 bump up buildkit
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-10-05 18:33:03 +09:00
Sebastiaan van Stijn
dd622c81a4
Update containerd client and dependencies to v1.2.0-rc.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-10-04 15:20:34 +02:00
Sebastiaan van Stijn
31a9c9e791
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>
2018-10-04 15:19:53 +02:00
Sebastiaan van Stijn
deac65c929
Merge pull request #37850 from AkihiroSuda/propagate-exec-root-to-libnetwork
daemon: propagate exec-root to libnetwork-setkey
2018-09-28 15:20:37 +02:00
Tibor Vass
e161a8d1e9 vendor buildkit to 8f4dff0d16ea91cb43315d5f5aa4b27f4fe4e1f2
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-09-27 21:21:49 +00:00
Brian Goff
d0970ab9a4
Merge pull request #37875 from Microsoft/jjh/bumpopengcs
Bump Microsoft/opengcs to v0.3.9
2018-09-26 10:19:26 -07:00
Tibor Vass
82388d048a vendor: update swarmkit to 9f271c2 and remove boltdb
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-09-24 17:36:07 +00:00
Tibor Vass
d0f00bc1fb builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-09-21 20:43:26 +00:00
Tõnis Tiigi
b1116479b2
Merge pull request #37852 from AntaresS/patch-buildkit
add support for "registry-mirrors" and "insecure-registries" to buildkit
2018-09-21 09:42:35 -07:00
John Howard
e57b2a8066 Bump containerd to d97a907f
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-18 10:26:13 -07:00
John Howard
c82f6a8faf Bump Microsoft/opengcs to v0.3.9
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-18 10:13:24 -07:00
Anda Xu
308701fac6 update vendor
Signed-off-by: Anda Xu <anda.xu@docker.com>
2018-09-16 12:57:17 -07:00
Yong Tang
2d7aa92b7d
Merge pull request #37805 from kolyshkin/bump-etcd
vendor: bump etcd to v3.3.9
2018-09-15 06:18:08 -07:00
Akihiro Suda
40385208cb daemon: propagate exec-root to libnetwork-setkey
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-09-15 13:49:30 +09:00
Sebastiaan van Stijn
9299561bd3
Merge pull request #37736 from selansen/master
Global Default AddressPool - Update
2018-09-14 18:47:42 +02:00
Akihiro Suda
5adee401d1
Merge pull request #37843 from Microsoft/jjh/boltdb
Revendor libnetwork @ 36d3bed0e9
2018-09-14 23:22:36 +09:00
Tibor Vass
9d276b8afd
Merge pull request #37644 from AntaresS/handle-cgroups
propagate the dockerd cgroup-parent config to buildkitd
2018-09-13 14:19:45 -07:00
John Howard
4ddebbe77f Vendor libnetwork @ 36d3bed0e9
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-13 13:52:45 -07:00
John Howard
1a6e2609ea Vendor libkv @ 458977154600b9f23984d9f4b82e79570b5ae12b
Signed-off-by: John Howard <jhoward@microsoft.com>

This also adds go.etcd.io/bbolt as boltdb/bolt is no longer
maintained, and we need https://github.com/etcd-io/bbolt/pull/122 which
was merged in https://github.com/etcd-io/bbolt/releases/tag/v1.3.1-etcd.8
in order to fix https://github.com/docker/libnetwork/issues/1950.

Note that I can't entirely remove boltdb/bolt as it is still used by
other components. Still need to work my way through them.... These include
containerd/containerd (https://github.com/containerd/containerd/pull/2634),
docker/swarmkit; moby/buildkit. And probably more....
2018-09-13 12:37:15 -07:00
Kir Kolyshkin
7008ac01fa vendor: bump etcd deps
As per https://github.com/etcd-io/etcd/blob/fa57f7fbc787b4/Gopkg.lock

List of packages required by subset of etcd used is provided by:

go list -f '{{join .Deps "\n"}}' \
 github.com/docker/docker/vendor/github.com/coreos/etcd/... \
 | grep -F . | grep -v coreos/etcd | sort | uniq

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-09-13 00:54:20 -07:00
Kir Kolyshkin
a77a2a406c vendor: bump etcd to v3.3.9
...and use ugorji/go 1.1.1

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-09-13 00:54:20 -07:00
selansen
148ff00a0a Global Default AddressPool - Update
Addressing few review comments as part of code refactoring.
Also moved validation logic from CLI to Moby.

Signed-off-by: selansen <elango.siva@docker.com>
2018-09-11 19:02:54 -04:00
John Howard
ddd4adb00a Bump Microsoft/hcsshim to v0.7.3
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-10 10:19:32 -07:00
Yong Tang
703a04ebc9
Merge pull request #37712 from Microsoft/jjh/detach
Windows: Try to detach sandbox on cleanup to avoid permission denied
2018-09-09 16:50:27 -07:00
Anda Xu
54b3af4c7d update vendor
Signed-off-by: Anda Xu <anda.xu@docker.com>
2018-09-07 17:48:41 -07:00
Sebastiaan van Stijn
ec99bd6ab8
Merge pull request #37358 from kolyshkin/go111
Bump golang to 1.11.0
2018-09-07 09:35:33 +01:00
Kir Kolyshkin
bac67204e1 vendor: bump containerd/continuity
This is to include the Go 1.11 fix
(https://github.com/containerd/continuity/pull/120).
Again (see c64a2448d1).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-09-06 15:24:22 -07:00
Kir Kolyshkin
09921ca33f Revendor ugorji/go
To include the following backported fix:

https://github.com/kolyshkin/ugorji-go/commit/1cf431c13dec46596

which should fix this:

> 13:40:53 vendor/github.com/ugorji/go/codec/gen-helper.generated.go:1:
> possible malformed +build comment%!(EXTRA []interface {}=[])

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-09-06 15:24:19 -07:00
John Howard
66966941f9 Vendor Microsoft/go-winio v0.4.11
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-06 09:54:24 -07:00
Kir Kolyshkin
92e7543903 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>
2018-09-06 09:43:41 -07:00
Tibor Vass
effa24bf48 vendor buildkit to fix a couple of bugs
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-09-04 15:17:40 +00:00
Sebastiaan van Stijn
41481abdc6
Merge pull request #37674 from Microsoft/jjh/revendor82018
Revendor Microsoft/hcsshim and go-winio, plus container/containerd
2018-08-25 19:54:22 +02:00
John Howard
2e5222a346 Bump containerd to 3f42445e38d1081f4b8c3b8d7d1ed1860198ed7a
Signed-off-by: John Howard <john.howard@microsoft.com>
2018-08-23 12:03:43 -07:00
John Howard
805211a6e8 Revendor hcsshim and go-winio
Signed-off-by: John Howard <john.howard@microsoft.com>
2018-08-23 12:03:33 -07:00
Tibor Vass
dc7e472db9 builder: fix bridge networking when using buildkit
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-08-23 05:20:01 +00:00
Tibor Vass
16084ea8c8 builder: temporarily disable bridge networking when using buildkit
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-08-22 03:29:17 +00:00
Tibor Vass
1800883bd1
Merge pull request #37558 from selansen/master
Global Default Address Pool feature support
2018-08-20 18:15:44 -07:00
selansen
f7ad95cab9 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>
2018-08-20 15:07:08 -04:00
Tonis Tiigi
bc67a78862 vendor: update buildkit to 46f9075a
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-08-20 18:54:10 +00:00