build(deps): bump github.com/opencontainers/runtime-spec from 1.0.3 t…

…o 1.1.0-rc4 This version is currently used in Linux distributions to build podman and friends Signed-off-by: Reinhard Tartler <[email protected]>
opencontainers · Sep 20, 2023 · cac950e · cac950e
1 parent fbc1339
commit cac950e
Show file tree

Hide file tree

Showing 13 changed files with 102 additions and 25 deletions.
diff --git a/cmd/umoci/config.go b/cmd/umoci/config.go
@@ -99,11 +99,13 @@ image.`,
 func toImage(config ispec.ImageConfig, meta mutate.Meta) ispec.Image {
 	created := meta.Created
 	return ispec.Image{
-		Config:       config,
-		Created:      &created,
-		Author:       meta.Author,
-		Architecture: meta.Architecture,
-		OS:           meta.OS,
+		Config:  config,
+		Created: &created,
+		Author:  meta.Author,
+		Platform: ispec.Platform{
+			Architecture: meta.Architecture,
+			OS:           meta.OS,
+		},
 	}
 }
 

diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/klauspost/pgzip v1.2.5
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
 	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.8
 	github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
 	github.com/pkg/errors v0.9.1

diff --git a/go.sum b/go.sum
@@ -65,6 +65,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 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 v1.1.8 h1:zICRlc+C1XzivLc3nzE+cbJV4LIi8tib6YG0MqC6OqA=
 github.com/opencontainers/runc v1.1.8/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc=

diff --git a/oci/casext/refname_dir_test.go b/oci/casext/refname_dir_test.go
@@ -131,10 +131,12 @@ func fakeSetupEngine(t *testing.T, engineExt Engine) ([]descriptorMap, error) {
 		// Create our config and insert it.
 		created := time.Now()
 		configDigest, configSize, err := engineExt.PutBlobJSON(ctx, ispec.Image{
-			Created:      &created,
-			Author:       "Jane Author <[email protected]>",
-			Architecture: runtime.GOARCH,
-			OS:           runtime.GOOS,
+			Created: &created,
+			Author:  "Jane Author <[email protected]>",
+			Platform: ispec.Platform{
+				Architecture: runtime.GOARCH,
+				OS:           runtime.GOOS,
+			},
 			RootFS: ispec.RootFS{
 				Type: "unknown",
 			},

diff --git a/oci/layer/unpack_test.go b/oci/layer/unpack_test.go
@@ -116,7 +116,9 @@ yRAbACGEEEIIIYQQQgghhBBCCKEr+wTE0sQyACgAAA==`,
 
 	// Create the config.
 	config := ispec.Image{
-		OS: "linux",
+		Platform: ispec.Platform{
+			OS: "linux",
+		},
 		RootFS: ispec.RootFS{
 			Type:    "layers",
 			DiffIDs: layerDigests,

diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/annotations.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/annotations.go
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/index.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/index.go
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/version.go b/vendor/github.com/opencontainers/image-spec/specs-go/version.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -50,8 +50,8 @@ github.com/mohae/deepcopy
 # 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.8