Merge pull request #2113 from containers/renovate/github.com-opencontainers-image-spec-1.x

fix(deps): update module github.com/opencontainers/image-spec to v1.1.0-rc5
This commit is contained in:
Daniel J Walsh 2023-09-14 15:06:49 -04:00 committed by GitHub
commit 7c7e6000ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 8 deletions

2
go.mod
View File

@ -9,7 +9,7 @@ require (
github.com/containers/storage v1.50.2 github.com/containers/storage v1.50.2
github.com/docker/distribution v2.8.2+incompatible github.com/docker/distribution v2.8.2+incompatible
github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0-rc4 github.com/opencontainers/image-spec v1.1.0-rc5
github.com/opencontainers/image-tools v1.0.0-rc3 github.com/opencontainers/image-tools v1.0.0-rc3
github.com/sirupsen/logrus v1.9.3 github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.7.0 github.com/spf13/cobra v1.7.0

4
go.sum
View File

@ -272,8 +272,8 @@ github.com/onsi/ginkgo/v2 v2.12.0 h1:UIVDowFPwpg6yMUpPjGkYvf06K3RAiJXUhCxEwQVHRI
github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= 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/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.0-rc4 h1:oOxKUJWnFC4YGHCCMNql1x4YaDfYBTS5Y4x/Cgeo1E0= github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=
github.com/opencontainers/image-spec v1.1.0-rc4/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
github.com/opencontainers/image-tools v1.0.0-rc3 h1:ZR837lBIxq6mmwEqfYrbLMuf75eBSHhccVHy6lsBeM4= github.com/opencontainers/image-tools v1.0.0-rc3 h1:ZR837lBIxq6mmwEqfYrbLMuf75eBSHhccVHy6lsBeM4=
github.com/opencontainers/image-tools v1.0.0-rc3/go.mod h1:A9btVpZLzttF4iFaKNychhPyrhfOjJ1OF5KrA8GcLj4= github.com/opencontainers/image-tools v1.0.0-rc3/go.mod h1:A9btVpZLzttF4iFaKNychhPyrhfOjJ1OF5KrA8GcLj4=
github.com/opencontainers/runc v1.1.9 h1:XR0VIHTGce5eWPkaPesqTBrhW2yAcaraWfsEalNwQLM= github.com/opencontainers/runc v1.1.9 h1:XR0VIHTGce5eWPkaPesqTBrhW2yAcaraWfsEalNwQLM=

View File

@ -212,6 +212,7 @@ func checkArchitecture(Architecture string, Variant string) {
"mips64": {""}, "mips64": {""},
"mips64le": {""}, "mips64le": {""},
"s390x": {""}, "s390x": {""},
"riscv64": {""},
} }
for arch, variants := range validCombins { for arch, variants := range validCombins {
if arch == Architecture { if arch == Architecture {
@ -232,7 +233,7 @@ func checkPlatform(OS string, Architecture string) {
"darwin": {"386", "amd64", "arm", "arm64"}, "darwin": {"386", "amd64", "arm", "arm64"},
"dragonfly": {"amd64"}, "dragonfly": {"amd64"},
"freebsd": {"386", "amd64", "arm"}, "freebsd": {"386", "amd64", "arm"},
"linux": {"386", "amd64", "arm", "arm64", "ppc64", "ppc64le", "mips64", "mips64le", "s390x"}, "linux": {"386", "amd64", "arm", "arm64", "ppc64", "ppc64le", "mips64", "mips64le", "s390x", "riscv64"},
"netbsd": {"386", "amd64", "arm"}, "netbsd": {"386", "amd64", "arm"},
"openbsd": {"386", "amd64", "arm"}, "openbsd": {"386", "amd64", "arm"},
"plan9": {"386", "amd64"}, "plan9": {"386", "amd64"},

View File

@ -21,7 +21,7 @@ import digest "github.com/opencontainers/go-digest"
// when marshalled to JSON. // when marshalled to JSON.
type Descriptor struct { type Descriptor struct {
// MediaType is the media type of the object this schema refers to. // MediaType is the media type of the object this schema refers to.
MediaType string `json:"mediaType,omitempty"` MediaType string `json:"mediaType"`
// Digest is the digest of the targeted content. // Digest is the digest of the targeted content.
Digest digest.Digest `json:"digest"` Digest digest.Digest `json:"digest"`

View File

@ -15,10 +15,14 @@
package v1 package v1
const ( const (
// ImageLayoutFile is the file name of oci image layout file // ImageLayoutFile is the file name containing ImageLayout in an OCI Image Layout
ImageLayoutFile = "oci-layout" ImageLayoutFile = "oci-layout"
// ImageLayoutVersion is the version of ImageLayout // ImageLayoutVersion is the version of ImageLayout
ImageLayoutVersion = "1.0.0" ImageLayoutVersion = "1.0.0"
// ImageIndexFile is the file name of the entry point for references and descriptors in an OCI Image Layout
ImageIndexFile = "index.json"
// ImageBlobsDir is the directory name containing content addressable blobs in an OCI Image Layout
ImageBlobsDir = "blobs"
) )
// ImageLayout is the structure in the "oci-layout" file, found in the root // ImageLayout is the structure in the "oci-layout" file, found in the root

View File

@ -25,7 +25,7 @@ const (
VersionPatch = 0 VersionPatch = 0
// VersionDev indicates development branch. Releases will be empty string. // VersionDev indicates development branch. Releases will be empty string.
VersionDev = "-rc.4" VersionDev = "-rc.5"
) )
// Version is the specification version that the package types support. // Version is the specification version that the package types support.

2
vendor/modules.txt vendored
View File

@ -432,7 +432,7 @@ github.com/oklog/ulid
# github.com/opencontainers/go-digest v1.0.0 # github.com/opencontainers/go-digest v1.0.0
## explicit; go 1.13 ## explicit; go 1.13
github.com/opencontainers/go-digest github.com/opencontainers/go-digest
# github.com/opencontainers/image-spec v1.1.0-rc4 # github.com/opencontainers/image-spec v1.1.0-rc5
## explicit; go 1.18 ## explicit; go 1.18
github.com/opencontainers/image-spec/schema github.com/opencontainers/image-spec/schema
github.com/opencontainers/image-spec/specs-go github.com/opencontainers/image-spec/specs-go