default os/arch for image export

More defaulting is required to fix same issues as openllb#354 where os/arch is required by buildkit
coryb · May 22, 2024 · f882a8b · f882a8b
1 parent 748fac9
commit f882a8b
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/codegen/builtin_fs.go b/codegen/builtin_fs.go
@@ -761,11 +761,20 @@ func (dp DockerPush) Call(ctx context.Context, cln *client.Client, val Value, op
 	}
 	exportFS.Image.ContainerConfig.Labels = exportFS.Image.Config.Labels
 
-	if exportFS.Image.OS == "" {
+	defaultPlat := DefaultPlatform(ctx)
+	switch {
+	case exportFS.Image.OS != "": // all good
+	case exportFS.Platform.OS != "":
 		exportFS.Image.OS = exportFS.Platform.OS
+	default:
+		exportFS.Image.OS = defaultPlat.OS
 	}
-	if exportFS.Image.Architecture == "" {
+	switch {
+	case exportFS.Image.Architecture != "": // all good
+	case exportFS.Platform.Architecture != "":
 		exportFS.Image.Architecture = exportFS.Platform.Architecture
+	default:
+		exportFS.Image.Architecture = defaultPlat.Architecture
 	}
 
 	var dgst string