Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[19.03] vendor: update buildkit for 19.03 #373

Merged
merged 1 commit into from
Sep 23, 2019

Conversation

tonistiigi
Copy link

@tonistiigi tonistiigi commented Sep 21, 2019

Brings in [docker-19.03] docker 19.03 / v0.6.2 cherry picks moby/buildkit#1178. Which cherry-picks the following changes into the BuildKit version used;

@andrewhsu
Copy link

I'm seeing failure but I think it is unrelated:

 --- FAIL: TestServiceWithDefaultAddressPoolInit (1.45s)
     service_test.go:398: Creating a new daemon at: /go/src/github.com/docker/docker/bundles/test-integration/1/TestServiceWithDefaultAddressPoolInit
     daemon.go:321: [dd1e75d7749c9] waiting for daemon to start
     daemon.go:339: [dd1e75d7749c9] daemon started
     service_test.go:423: TestServiceWithDefaultAddressPoolInit: NetworkInspect: {Name:saanvisthiraTestServiceWithDefaultAddressPoolInit ID:zgtqppmcdlfi5op5tw5gdbxu8 Created:2019-09-21 01:06:10.441820056 +0000 UTC Scope:swarm Driver:overlay EnableIPv6:false IPAM:{Driver:default Options:map[] Config:[{Subnet:20.20.1.0/24 IPRange: Gateway:20.20.1.1 AuxAddress:map[]}]} Internal:false Attachable:false Ingress:false ConfigFrom:{Network:} ConfigOnly:false Containers:map[] Options:map[com.docker.network.driver.overlay.vxlanid_list:4097] Labels:map[] Peers:[] Services:map[]}
     service_test.go:425: assertion failed: 20.20.1.0/24 (out.IPAM.Config[0].Subnet string) != 20.20.0.0/24 (string)

@andrewhsu andrewhsu added this to the 19.03.3 milestone Sep 21, 2019
@andrewhsu
Copy link

@tonistiigi can you rebase this? reverted the swarmkit changes that was causing TestServiceWithDefaultAddressPoolInit failures

Copy link

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

amd64 tests green

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants