From eaa3a8ad80ff0393784f2011e8b0d9e3572cf78e Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 13 Jan 2025 21:27:31 -0800 Subject: [PATCH] vendor: update fsutil to b14e27f4 Signed-off-by: Tonis Tiigi --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/tonistiigi/fsutil/Dockerfile | 2 +- vendor/github.com/tonistiigi/fsutil/docker-bake.hcl | 11 +++++++++++ vendor/github.com/tonistiigi/fsutil/filter.go | 2 +- vendor/modules.txt | 2 +- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 03da6fb38e8b..dcee2c754254 100644 --- a/go.mod +++ b/go.mod @@ -71,7 +71,7 @@ require ( github.com/spdx/tools-golang v0.5.3 github.com/stretchr/testify v1.9.0 github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205 - github.com/tonistiigi/fsutil v0.0.0-20241121093142-31cf1f437184 + github.com/tonistiigi/fsutil v0.0.0-20250113203817-b14e27f4135a github.com/tonistiigi/go-actions-cache v0.0.0-20241210095730-017636a73805 github.com/tonistiigi/go-archvariant v1.0.0 github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 diff --git a/go.sum b/go.sum index 69b5396aa6cd..4309b8378649 100644 --- a/go.sum +++ b/go.sum @@ -384,8 +384,8 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtse github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205 h1:eUk79E1w8yMtXeHSzjKorxuC8qJOnyXQnLaJehxpJaI= github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205/go.mod h1:3Iuxbr0P7D3zUzBMAZB+ois3h/et0shEz0qApgHYGpY= -github.com/tonistiigi/fsutil v0.0.0-20241121093142-31cf1f437184 h1:RgyoSI38Y36zjQaszel/0RAcIehAnjA1B0RiUV9SDO4= -github.com/tonistiigi/fsutil v0.0.0-20241121093142-31cf1f437184/go.mod h1:Dl/9oEjK7IqnjAm21Okx/XIxUCFJzvh+XdVHUlBwXTw= +github.com/tonistiigi/fsutil v0.0.0-20250113203817-b14e27f4135a h1:EfGw4G0x/8qXWgtcZ6KVaPS+wpWOQMaypczzP8ojkMY= +github.com/tonistiigi/fsutil v0.0.0-20250113203817-b14e27f4135a/go.mod h1:Dl/9oEjK7IqnjAm21Okx/XIxUCFJzvh+XdVHUlBwXTw= github.com/tonistiigi/go-actions-cache v0.0.0-20241210095730-017636a73805 h1:l2x1Ubj8f5xhPzZI428ZQ6+BDafGovpdk2ITnD3twTw= github.com/tonistiigi/go-actions-cache v0.0.0-20241210095730-017636a73805/go.mod h1:xsu+XeKT9piH/5f9Y1Zsv5krQqI34CWkIusbs5027IM= github.com/tonistiigi/go-archvariant v1.0.0 h1:5LC1eDWiBNflnTF1prCiX09yfNHIxDC/aukdhCdTyb0= diff --git a/vendor/github.com/tonistiigi/fsutil/Dockerfile b/vendor/github.com/tonistiigi/fsutil/Dockerfile index 3a76d341fb45..3501573d6d53 100644 --- a/vendor/github.com/tonistiigi/fsutil/Dockerfile +++ b/vendor/github.com/tonistiigi/fsutil/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG GO_VERSION=1.23 -ARG XX_VERSION=1.5.0 +ARG XX_VERSION=1.6.1 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx diff --git a/vendor/github.com/tonistiigi/fsutil/docker-bake.hcl b/vendor/github.com/tonistiigi/fsutil/docker-bake.hcl index 9b3070685378..ea73bd208382 100644 --- a/vendor/github.com/tonistiigi/fsutil/docker-bake.hcl +++ b/vendor/github.com/tonistiigi/fsutil/docker-bake.hcl @@ -27,11 +27,18 @@ target "_platforms" { ] } +target "_common" { + args = { + BUILDKIT_CONTEXT_KEEP_GIT_DIR = 1 + } +} + group "default" { targets = ["build"] } target "build" { + inherits = ["_common"] args = { GO_VERSION = "${GO_VERSION}" } @@ -54,6 +61,7 @@ target "test-noroot" { } target "lint" { + inherits = ["_common"] dockerfile = "./hack/dockerfiles/lint.Dockerfile" output = ["type=cacheonly"] args = { @@ -66,6 +74,7 @@ target "lint-cross" { } target "validate-generated-files" { + inherits = ["_common"] dockerfile = "./hack/dockerfiles/generated-files.Dockerfile" output = ["type=cacheonly"] target = "validate" @@ -81,6 +90,7 @@ target "generated-files" { } target "validate-gomod" { + inherits = ["_common"] dockerfile = "./hack/dockerfiles/gomod.Dockerfile" output = ["type=cacheonly"] target = "validate" @@ -99,6 +109,7 @@ target "gomod" { } target "validate-shfmt" { + inherits = ["_common"] dockerfile = "./hack/dockerfiles/shfmt.Dockerfile" output = ["type=cacheonly"] target = "validate" diff --git a/vendor/github.com/tonistiigi/fsutil/filter.go b/vendor/github.com/tonistiigi/fsutil/filter.go index 9cee8ad238ac..2f0387e12de7 100644 --- a/vendor/github.com/tonistiigi/fsutil/filter.go +++ b/vendor/github.com/tonistiigi/fsutil/filter.go @@ -111,7 +111,7 @@ func NewFilterFS(fs FS, opt *FilterOpt) (FS, error) { if len(includePatterns) > 0 { includeMatcher, err = patternmatcher.New(includePatterns) if err != nil { - return nil, errors.Wrapf(err, "invalid includepatterns: %s", opt.IncludePatterns) + return nil, errors.Wrapf(err, "invalid includepatterns: %s", includePatterns) } for _, p := range includeMatcher.Patterns() { diff --git a/vendor/modules.txt b/vendor/modules.txt index c49ab760fbb2..918d4435bf26 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -786,7 +786,7 @@ github.com/syndtr/gocapability/capability # github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205 ## explicit; go 1.21 github.com/tonistiigi/dchapes-mode -# github.com/tonistiigi/fsutil v0.0.0-20241121093142-31cf1f437184 +# github.com/tonistiigi/fsutil v0.0.0-20250113203817-b14e27f4135a ## explicit; go 1.21 github.com/tonistiigi/fsutil github.com/tonistiigi/fsutil/copy