go.mod: bump buildx v0.28.0-rc2, buildkit v0.24.0-rc2

thaJeztah · ndeloof · commit b33ecf65e866 · 2025-09-02T07:28:06.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/containerd/platforms v1.0.0-rc.1
 	github.com/davecgh/go-spew v1.1.1
 	github.com/distribution/reference v0.6.0
-	github.com/docker/buildx v0.28.0-rc1
+	github.com/docker/buildx v0.28.0-rc2
 	github.com/docker/cli v28.3.3+incompatible
 	github.com/docker/cli-docs-tool v0.10.0
 	github.com/docker/docker v28.3.3+incompatible
@@ -28,7 +28,7 @@ require (
 	github.com/mattn/go-shellwords v1.0.12
 	github.com/mitchellh/go-ps v1.0.0
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/moby/buildkit v0.24.0-rc1
+	github.com/moby/buildkit v0.24.0-rc2
 	github.com/moby/go-archive v0.1.0
 	github.com/moby/patternmatcher v0.6.0
 	github.com/moby/sys/atomicwriter v0.1.0
diff --git a/go.sum b/go.sum
@@ -128,8 +128,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
 github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/docker/buildx v0.28.0-rc1 h1:XQ0hwhIB+Jf211iBdts30WtsqIQ8/xY7/QcYDzfDFEY=
-github.com/docker/buildx v0.28.0-rc1/go.mod h1:LGGGhqW6EbnC96hK9XSVh4h7kI+G/bwTgJJh/uAuQWo=
+github.com/docker/buildx v0.28.0-rc2 h1:UYwiYhk9B0Wkw0cTWjoP7caujfwvsSJfxu41xheXQQ8=
+github.com/docker/buildx v0.28.0-rc2/go.mod h1:nhsrcN6qzbyOZWsXHwc/nqr70CdvJ7b6CEOEMQ1/0KY=
 github.com/docker/cli v28.3.3+incompatible h1:fp9ZHAr1WWPGdIWBM1b3zLtgCF+83gRdVMTJsUeiyAo=
 github.com/docker/cli v28.3.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/cli-docs-tool v0.10.0 h1:bOD6mKynPQgojQi3s2jgcUWGp/Ebqy1SeCr9VfKQLLU=
@@ -318,8 +318,8 @@ github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/z
 github.com/mitchellh/mapstructure v0.0.0-20150613213606-2caf8efc9366/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/moby/buildkit v0.24.0-rc1 h1:taA+MPeYWtGyRQ1SGbdTHVk5khWKFR7f9WI2coW/Ggs=
-github.com/moby/buildkit v0.24.0-rc1/go.mod h1:4qovICAdR2H4C7+EGMRva5zgHW1gyhT4/flHI7F5F9k=
+github.com/moby/buildkit v0.24.0-rc2 h1:1Z9+R162yauf3SYvn8cGjBPnglMDK4bO+00dNlJSgZI=
+github.com/moby/buildkit v0.24.0-rc2/go.mod h1:4qovICAdR2H4C7+EGMRva5zgHW1gyhT4/flHI7F5F9k=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
 github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
diff --git a/pkg/compose/build_bake.go b/pkg/compose/build_bake.go
@@ -218,7 +218,7 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
 
 		read = append(read, build.Context)
 		for _, path := range build.AdditionalContexts {
-			_, err := gitutil.ParseGitRef(path)
+			_, _, err := gitutil.ParseGitRef(path)
 			if !strings.Contains(path, "://") && err != nil {
 				read = append(read, path)
 			}
diff --git a/pkg/remote/git.go b/pkg/remote/git.go
@@ -64,7 +64,7 @@ type gitRemoteLoader struct {
 }
 
 func (g gitRemoteLoader) Accept(path string) bool {
-	_, err := gitutil.ParseGitRef(path)
+	_, _, err := gitutil.ParseGitRef(path)
 	return err == nil
 }
 
@@ -79,15 +79,15 @@ func (g gitRemoteLoader) Load(ctx context.Context, path string) (string, error)
 		return "", fmt.Errorf("git remote resource is disabled by %q", GIT_REMOTE_ENABLED)
 	}
 
-	ref, err := gitutil.ParseGitRef(path)
+	ref, _, err := gitutil.ParseGitRef(path)
 	if err != nil {
 		return "", err
 	}
 
 	local, ok := g.known[path]
 	if !ok {
-		if ref.Commit == "" {
-			ref.Commit = "HEAD" // default branch
+		if ref.Ref == "" {
+			ref.Ref = "HEAD" // default branch
 		}
 
 		err = g.resolveGitRef(ctx, path, ref)
@@ -100,7 +100,7 @@ func (g gitRemoteLoader) Load(ctx context.Context, path string) (string, error)
 			return "", fmt.Errorf("initializing remote resource cache: %w", err)
 		}
 
-		local = filepath.Join(cache, ref.Commit)
+		local = filepath.Join(cache, ref.Ref)
 		if _, err := os.Stat(local); os.IsNotExist(err) {
 			if g.offline {
 				return "", nil
@@ -130,8 +130,8 @@ func (g gitRemoteLoader) Dir(path string) string {
 }
 
 func (g gitRemoteLoader) resolveGitRef(ctx context.Context, path string, ref *gitutil.GitRef) error {
-	if !commitSHA.MatchString(ref.Commit) {
-		cmd := exec.CommandContext(ctx, "git", "ls-remote", "--exit-code", ref.Remote, ref.Commit)
+	if !commitSHA.MatchString(ref.Ref) {
+		cmd := exec.CommandContext(ctx, "git", "ls-remote", "--exit-code", ref.Remote, ref.Ref)
 		cmd.Env = g.gitCommandEnv()
 		out, err := cmd.CombinedOutput()
 		if err != nil {
@@ -147,7 +147,7 @@ func (g gitRemoteLoader) resolveGitRef(ctx context.Context, path string, ref *gi
 		if !commitSHA.MatchString(sha) {
 			return fmt.Errorf("invalid commit sha %q", sha)
 		}
-		ref.Commit = sha
+		ref.Ref = sha
 	}
 	return nil
 }
@@ -169,7 +169,7 @@ func (g gitRemoteLoader) checkout(ctx context.Context, path string, ref *gitutil
 		return err
 	}
 
-	cmd = exec.CommandContext(ctx, "git", "fetch", "--depth=1", "origin", ref.Commit)
+	cmd = exec.CommandContext(ctx, "git", "fetch", "--depth=1", "origin", ref.Ref)
 	cmd.Env = g.gitCommandEnv()
 	cmd.Dir = path
 
@@ -178,7 +178,7 @@ func (g gitRemoteLoader) checkout(ctx context.Context, path string, ref *gitutil
 		return err
 	}
 
-	cmd = exec.CommandContext(ctx, "git", "checkout", ref.Commit)
+	cmd = exec.CommandContext(ctx, "git", "checkout", ref.Ref)
 	cmd.Dir = path
 	err = cmd.Run()
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ func (s composeService) doBuildBake(ctx context.Context, project types.Project`
`218`	`218`
`219`	`219`	`read = append(read, build.Context)`
`220`	`220`	`for _, path := range build.AdditionalContexts {`
`221`		`- _, err := gitutil.ParseGitRef(path)`
	`221`	`+ _, _, err := gitutil.ParseGitRef(path)`
`222`	`222`	`if !strings.Contains(path, "://") && err != nil {`
`223`	`223`	`read = append(read, path)`
`224`	`224`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ type gitRemoteLoader struct {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func (g gitRemoteLoader) Accept(path string) bool {`
`67`		`- _, err := gitutil.ParseGitRef(path)`
	`67`	`+ _, _, err := gitutil.ParseGitRef(path)`
`68`	`68`	`return err == nil`
`69`	`69`	`}`
`70`	`70`
`@@ -79,15 +79,15 @@ func (g gitRemoteLoader) Load(ctx context.Context, path string) (string, error)`
`79`	`79`	`return "", fmt.Errorf("git remote resource is disabled by %q", GIT_REMOTE_ENABLED)`
`80`	`80`	`}`
`81`	`81`
`82`		`- ref, err := gitutil.ParseGitRef(path)`
	`82`	`+ ref, _, err := gitutil.ParseGitRef(path)`
`83`	`83`	`if err != nil {`
`84`	`84`	`return "", err`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`local, ok := g.known[path]`
`88`	`88`	`if !ok {`
`89`		`- if ref.Commit == "" {`
`90`		`- ref.Commit = "HEAD" // default branch`
	`89`	`+ if ref.Ref == "" {`
	`90`	`+ ref.Ref = "HEAD" // default branch`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`err = g.resolveGitRef(ctx, path, ref)`
`@@ -100,7 +100,7 @@ func (g gitRemoteLoader) Load(ctx context.Context, path string) (string, error)`
`100`	`100`	`return "", fmt.Errorf("initializing remote resource cache: %w", err)`
`101`	`101`	`}`
`102`	`102`
`103`		`- local = filepath.Join(cache, ref.Commit)`
	`103`	`+ local = filepath.Join(cache, ref.Ref)`
`104`	`104`	`if _, err := os.Stat(local); os.IsNotExist(err) {`
`105`	`105`	`if g.offline {`
`106`	`106`	`return "", nil`
`@@ -130,8 +130,8 @@ func (g gitRemoteLoader) Dir(path string) string {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`func (g gitRemoteLoader) resolveGitRef(ctx context.Context, path string, ref *gitutil.GitRef) error {`
`133`		`- if !commitSHA.MatchString(ref.Commit) {`
`134`		`- cmd := exec.CommandContext(ctx, "git", "ls-remote", "--exit-code", ref.Remote, ref.Commit)`
	`133`	`+ if !commitSHA.MatchString(ref.Ref) {`
	`134`	`+ cmd := exec.CommandContext(ctx, "git", "ls-remote", "--exit-code", ref.Remote, ref.Ref)`
`135`	`135`	`cmd.Env = g.gitCommandEnv()`
`136`	`136`	`out, err := cmd.CombinedOutput()`
`137`	`137`	`if err != nil {`
`@@ -147,7 +147,7 @@ func (g gitRemoteLoader) resolveGitRef(ctx context.Context, path string, ref *gi`
`147`	`147`	`if !commitSHA.MatchString(sha) {`
`148`	`148`	`return fmt.Errorf("invalid commit sha %q", sha)`
`149`	`149`	`}`
`150`		`- ref.Commit = sha`
	`150`	`+ ref.Ref = sha`
`151`	`151`	`}`
`152`	`152`	`return nil`
`153`	`153`	`}`
`@@ -169,7 +169,7 @@ func (g gitRemoteLoader) checkout(ctx context.Context, path string, ref *gitutil`
`169`	`169`	`return err`
`170`	`170`	`}`
`171`	`171`
`172`		`- cmd = exec.CommandContext(ctx, "git", "fetch", "--depth=1", "origin", ref.Commit)`
	`172`	`+ cmd = exec.CommandContext(ctx, "git", "fetch", "--depth=1", "origin", ref.Ref)`
`173`	`173`	`cmd.Env = g.gitCommandEnv()`
`174`	`174`	`cmd.Dir = path`
`175`	`175`
`@@ -178,7 +178,7 @@ func (g gitRemoteLoader) checkout(ctx context.Context, path string, ref *gitutil`
`178`	`178`	`return err`
`179`	`179`	`}`
`180`	`180`
`181`		`- cmd = exec.CommandContext(ctx, "git", "checkout", ref.Commit)`
	`181`	`+ cmd = exec.CommandContext(ctx, "git", "checkout", ref.Ref)`
`182`	`182`	`cmd.Dir = path`
`183`	`183`	`err = cmd.Run()`
`184`	`184`	`if err != nil {`