From 95831246a2b3dc59ad4696ebaf02a0f9e530876a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 10 Sep 2022 12:09:06 +0200 Subject: [PATCH] Update uses of Image platform fields in OCI image-spec The OCI image spec is considering to change the Image struct and embedding the Platform type (see opencontainers/image-spec#959) in the go implementation. Moby currently uses some struct-literals to propagate the platform fields, which will break once those changes in the OCI spec are merged. Ideally (once that change arrives) we would update the code to set the Platform information as a whole, instead of assigning related fields individually, but in some cases in the code, image platform information is only partially set (for example, OSVersion and OSFeatures are not preserved in all cases). This may be on purpose, so needs to be reviewed. This patch keeps the current behavior (assigning only specific fields), but removes the use of struct-literals to make the code compatible with the upcoming changes in the image-spec module. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 3cb933db9d34ad2c75245851332df45c6ff82bf2) Signed-off-by: Sebastiaan van Stijn --- builder/builder-next/exporter/writer.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/builder/builder-next/exporter/writer.go b/builder/builder-next/exporter/writer.go index 4935010171..9c4063534b 100644 --- a/builder/builder-next/exporter/writer.go +++ b/builder/builder-next/exporter/writer.go @@ -22,11 +22,10 @@ import ( func emptyImageConfig() ([]byte, error) { pl := platforms.Normalize(platforms.DefaultSpec()) - img := ocispec.Image{ - Architecture: pl.Architecture, - OS: pl.OS, - Variant: pl.Variant, - } + img := ocispec.Image{} + img.Architecture = pl.Architecture + img.OS = pl.OS + img.Variant = pl.Variant img.RootFS.Type = "layers" img.Config.WorkingDir = "/" img.Config.Env = []string{"PATH=" + system.DefaultPathEnv(pl.OS)}