From 083da4862d9c88b3b40d6f4e1b21f6ce76920fd6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 29 Mar 2019 01:41:32 +0100 Subject: [PATCH] bump buildkit ed4da8b4a9661f278ae8433056ca37d0727c408b (docker-18.09 branch) brings in moby/buildkit#911 [docker-18.09] llbsolver: fix selectors dedupe (backport of https://github.com/moby/buildkit/pull/858) fixes https://github.com/moby/moby/issues/38964 Signed-off-by: Sebastiaan van Stijn --- vendor.conf | 2 +- vendor/github.com/moby/buildkit/solver/llbsolver/ops/exec.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor.conf b/vendor.conf index 0f48939f7e..d4d70dd63d 100644 --- a/vendor.conf +++ b/vendor.conf @@ -26,7 +26,7 @@ github.com/imdario/mergo v0.3.6 golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca # buildkit -github.com/moby/buildkit d9f75920678e35090025bb89344c5370e2efc8e7 +github.com/moby/buildkit ed4da8b4a9661f278ae8433056ca37d0727c408b # docker-18.09 branch github.com/tonistiigi/fsutil 2862f6bc5ac9b97124e552a5c108230b38a1b0ca github.com/grpc-ecosystem/grpc-opentracing 8e809c8a86450a29b90dcc9efbf062d0fe6d9746 github.com/opentracing/opentracing-go 1361b9cd60be79c4c3a7fa9841b3c132e40066a7 diff --git a/vendor/github.com/moby/buildkit/solver/llbsolver/ops/exec.go b/vendor/github.com/moby/buildkit/solver/llbsolver/ops/exec.go index 9eb9968a14..6a9ce2d310 100644 --- a/vendor/github.com/moby/buildkit/solver/llbsolver/ops/exec.go +++ b/vendor/github.com/moby/buildkit/solver/llbsolver/ops/exec.go @@ -151,7 +151,7 @@ func dedupePaths(inp []string) []string { for p1 := range old { var skip bool for p2 := range old { - if p1 != p2 && strings.HasPrefix(p1, p2) { + if p1 != p2 && strings.HasPrefix(p1, p2+"/") { skip = true break }