Merge pull request #3103 from thaJeztah/image_remove_variant

exporter/containerimage/image: Image: remove custom Variant field
moby · Sep 10, 2022 · 9cc806a · 9cc806a
2 parents abde08a + 6ea70c5
commit 9cc806a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/exporter/containerimage/image/docker_image.go b/exporter/containerimage/image/docker_image.go
@@ -49,7 +49,4 @@ type Image struct {
 
 	// Config defines the execution parameters which should be used as a base when running a container using the image.
 	Config ImageConfig `json:"config,omitempty"`
-
-	// Variant defines platform variant. To be added to OCI.
-	Variant string `json:"variant,omitempty"`
 }
diff --git a/frontend/dockerfile/dockerfile2llb/image.go b/frontend/dockerfile/dockerfile2llb/image.go
@@ -24,8 +24,8 @@ func emptyImage(platform ocispecs.Platform) Image {
 		Image: ocispecs.Image{
 			Architecture: platform.Architecture,
 			OS:           platform.OS,
+			Variant:      platform.Variant,
 		},
-		Variant: platform.Variant,
 	}
 	img.RootFS.Type = "layers"
 	img.Config.WorkingDir = "/"