diff --git a/hack/vendor.sh b/hack/vendor.sh index c42a95df..321ec973 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -25,7 +25,7 @@ clone git golang.org/x/net master https://github.com/golang/net.git clone git github.com/docker/distribution master clone git github.com/docker/libtrust master clone git github.com/opencontainers/runc master -clone git github.com/opencontainers/image-spec master +clone git github.com/opencontainers/image-spec 7dc1ee39c59c6949612c6fdf502a4727750cb063 clone git github.com/mtrmac/gpgme master # openshift/origin' k8s dependencies as of OpenShift v1.1.5 clone git github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed diff --git a/vendor/github.com/containers/image/oci/layout/oci_dest.go b/vendor/github.com/containers/image/oci/layout/oci_dest.go index c306d7db..de79eb50 100644 --- a/vendor/github.com/containers/image/oci/layout/oci_dest.go +++ b/vendor/github.com/containers/image/oci/layout/oci_dest.go @@ -13,7 +13,6 @@ import ( "github.com/containers/image/manifest" "github.com/containers/image/types" - imgspec "github.com/opencontainers/image-spec/specs-go" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" ) @@ -153,7 +152,7 @@ func (d *ociImageDestination) PutManifest(m []byte) error { if err != nil { return err } - desc := imgspec.Descriptor{} + desc := imgspecv1.Descriptor{} desc.Digest = digest // TODO(runcom): beaware and add support for OCI manifest list desc.MediaType = mt diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/descriptor.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go similarity index 98% rename from vendor/github.com/opencontainers/image-spec/specs-go/descriptor.go rename to vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go index 7a206559..a086f150 100644 --- a/vendor/github.com/opencontainers/image-spec/specs-go/descriptor.go +++ b/vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package specs +package v1 // Descriptor describes the disposition of targeted content. type Descriptor struct { 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 index 10bde087..d8b06306 100644 --- a/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go +++ b/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go @@ -22,10 +22,10 @@ type Manifest struct { // Config references a configuration object for a container, by digest. // The referenced configuration object is a JSON blob that the runtime uses to set up the container. - Config specs.Descriptor `json:"config"` + Config Descriptor `json:"config"` // Layers is an indexed list of layers referenced by the manifest. - Layers []specs.Descriptor `json:"layers"` + Layers []Descriptor `json:"layers"` // Annotations contains arbitrary metadata for the manifest list. Annotations map[string]string `json:"annotations"` diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go index 8c02ee28..0ad015d5 100644 --- a/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go +++ b/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go @@ -44,7 +44,7 @@ type Platform struct { // ManifestDescriptor describes a platform specific manifest. type ManifestDescriptor struct { - specs.Descriptor + Descriptor // Platform describes the platform which the image in the manifest runs on. Platform Platform `json:"platform"` 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 index 90199dd3..d6592f54 100644 --- a/vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go +++ b/vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go @@ -25,11 +25,11 @@ const ( MediaTypeImageManifestList = "application/vnd.oci.image.manifest.list.v1+json" // MediaTypeImageLayer is the media type used for layers referenced by the manifest. - MediaTypeImageLayer = "application/vnd.oci.image.layer.tar+gzip" + MediaTypeImageLayer = "application/vnd.oci.image.layer.v1.tar+gzip" // MediaTypeImageLayerNonDistributable is the media type for layers referenced by // the manifest but with distribution restrictions. - MediaTypeImageLayerNonDistributable = "application/vnd.oci.image.layer.nondistributable.tar+gzip" + MediaTypeImageLayerNonDistributable = "application/vnd.oci.image.layer.nondistributable.v1.tar+gzip" // MediaTypeImageConfig specifies the media type for the image configuration. MediaTypeImageConfig = "application/vnd.oci.image.config.v1+json" diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/version.go b/vendor/github.com/opencontainers/image-spec/specs-go/version.go index 77704299..282f089d 100644 --- a/vendor/github.com/opencontainers/image-spec/specs-go/version.go +++ b/vendor/github.com/opencontainers/image-spec/specs-go/version.go @@ -20,7 +20,7 @@ const ( // VersionMajor is for an API incompatible changes VersionMajor = 0 // VersionMinor is for functionality in a backwards-compatible manner - VersionMinor = 3 + VersionMinor = 5 // VersionPatch is for backwards-compatible bug fixes VersionPatch = 0