Merge pull request containerd#3388 from apostasie/dev-fix-3386-oci-export

AkihiroSuda · web-flow · commit 2968d453dd9f · 2024-09-01T14:18:12.000+09:00
Do not load build output if dest is specified
diff --git a/pkg/cmd/builder/build.go b/pkg/cmd/builder/build.go
@@ -228,7 +228,9 @@ func generateBuildctlArgs(ctx context.Context, client *containerd.Client, option
 			output = fmt.Sprintf("type=local,dest=%s", output)
 		}
 		if strings.Contains(output, "type=docker") || strings.Contains(output, "type=oci") {
-			needsLoading = true
+			if !strings.Contains(output, "dest=") {
+				needsLoading = true
+			}
 		}
 	}
 	if tags = strutil.DedupeStrSlice(options.Tag); len(tags) > 0 {

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,9 @@ func generateBuildctlArgs(ctx context.Context, client *containerd.Client, option`
`228`	`228`	`output = fmt.Sprintf("type=local,dest=%s", output)`
`229`	`229`	`}`
`230`	`230`	`if strings.Contains(output, "type=docker") \|\| strings.Contains(output, "type=oci") {`
`231`		`- needsLoading = true`
	`231`	`+ if !strings.Contains(output, "dest=") {`
	`232`	`+ needsLoading = true`
	`233`	`+ }`
`232`	`234`	`}`
`233`	`235`	`}`
`234`	`236`	`if tags = strutil.DedupeStrSlice(options.Tag); len(tags) > 0 {`