Merge pull request Mirantis#188 from AkihiroSuda/image-spec-v1.1.0-rc3

go.mod: github.com/opencontainers/image-spec v1.1.0-rc3

core/convert.go

@@ -86,13 +86,15 @@ func imageInspectToRuntimeAPIImageInfo(image *dockertypes.ImageInspect, history
 	}
 
 	imageSpec := imagespec.Image{
-		Created:      &createdAt,
-		Author:       image.Author,
-		Architecture: image.Architecture,
-		OS:           image.Os,
-		Config:       toRuntimeAPIConfig(image.Config),
-		RootFS:       toRuntimeAPIRootFS(image.RootFS),
-		History:      toRuntimeAPIHistory(history),
+		Created: &createdAt,
+		Author:  image.Author,
+		Platform: imagespec.Platform{
+			Architecture: image.Architecture,
+			OS:           image.Os,
+		},
+		Config:  toRuntimeAPIConfig(image.Config),
+		RootFS:  toRuntimeAPIRootFS(image.RootFS),
+		History: toRuntimeAPIHistory(history),
 	}
 
 	imi := &verboseImageInfo{

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/emicklei/go-restful v2.16.0+incompatible
 	github.com/golang/mock v1.6.0
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/opencontainers/image-spec v1.0.2
+	github.com/opencontainers/image-spec v1.1.0-rc3
 	github.com/opencontainers/runc v1.1.4
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.0

go.sum

@@ -554,8 +554,9 @@ github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
 github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/image-spec v1.1.0-rc3 h1:fzg1mXZFj8YdPeNkRXMg+zb88BFV0Ys52cJydRwBkb8=
+github.com/opencontainers/image-spec v1.1.0-rc3/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
 github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc95/go.mod h1:z+bZxa/+Tz/FmYVWkhUajJdzFeOqjc5vrqskhVyHGUM=
 github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=

vendor/modules.txt

@@ -255,8 +255,8 @@ github.com/munnerz/goautoneg
 # github.com/opencontainers/go-digest v1.0.0
 ## explicit; go 1.13
 github.com/opencontainers/go-digest
-# github.com/opencontainers/image-spec v1.0.2
-## explicit
+# github.com/opencontainers/image-spec v1.1.0-rc3
+## explicit; go 1.18
 github.com/opencontainers/image-spec/specs-go
 github.com/opencontainers/image-spec/specs-go/v1
 # github.com/opencontainers/runc v1.1.4