github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-12 19:56:17 +00:00
Code Issues Projects Releases Wiki Activity

update opencontainers/image-spec

Browse Source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-10-01 19:50:56 +02:00
parent 507d09876d
commit efb47cf374
No known key found for this signature in database
GPG Key ID: B2BEAD150DE936B9
7 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/vendor.sh
View File

@ -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/distribution master
clone git github.com/docker/libtrust master clone git github.com/docker/libtrust master
clone git github.com/opencontainers/runc 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 clone git github.com/mtrmac/gpgme master
# openshift/origin' k8s dependencies as of OpenShift v1.1.5 # openshift/origin' k8s dependencies as of OpenShift v1.1.5
clone git github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed clone git github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed

3
vendor/github.com/containers/image/oci/layout/oci_dest.go generated vendored
View File

@ -13,7 +13,6 @@ import (
"github.com/containers/image/manifest" "github.com/containers/image/manifest"
"github.com/containers/image/types" "github.com/containers/image/types"
imgspec "github.com/opencontainers/image-spec/specs-go"
imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
) )
@ -153,7 +152,7 @@ func (d *ociImageDestination) PutManifest(m []byte) error {
if err != nil { if err != nil {
return err return err
} }
desc := imgspec.Descriptor{} desc := imgspecv1.Descriptor{}
desc.Digest = digest desc.Digest = digest
// TODO(runcom): beaware and add support for OCI manifest list // TODO(runcom): beaware and add support for OCI manifest list
desc.MediaType = mt desc.MediaType = mt

2
vendor/github.com/opencontainers/image-spec/specs-go/descriptor.go → vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go generated vendored
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package specs package v1
// Descriptor describes the disposition of targeted content. // Descriptor describes the disposition of targeted content.
type Descriptor struct { type Descriptor struct {

4
vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go generated vendored
View File

@ -22,10 +22,10 @@ type Manifest struct {
// Config references a configuration object for a container, by digest. // 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. // 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 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 contains arbitrary metadata for the manifest list.
Annotations map[string]string `json:"annotations"` Annotations map[string]string `json:"annotations"`

2
vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go generated vendored
View File

@ -44,7 +44,7 @@ type Platform struct {
// ManifestDescriptor describes a platform specific manifest. // ManifestDescriptor describes a platform specific manifest.
type ManifestDescriptor struct { type ManifestDescriptor struct {
specs.Descriptor Descriptor
// Platform describes the platform which the image in the manifest runs on. // Platform describes the platform which the image in the manifest runs on.
Platform Platform `json:"platform"` Platform Platform `json:"platform"`

4
vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go generated vendored
View File

@ -25,11 +25,11 @@ const (
MediaTypeImageManifestList = "application/vnd.oci.image.manifest.list.v1+json" MediaTypeImageManifestList = "application/vnd.oci.image.manifest.list.v1+json"
// MediaTypeImageLayer is the media type used for layers referenced by the manifest. // 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 // MediaTypeImageLayerNonDistributable is the media type for layers referenced by
// the manifest but with distribution restrictions. // 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 specifies the media type for the image configuration.
MediaTypeImageConfig = "application/vnd.oci.image.config.v1+json" MediaTypeImageConfig = "application/vnd.oci.image.config.v1+json"

2
vendor/github.com/opencontainers/image-spec/specs-go/version.go generated vendored
View File

@ -20,7 +20,7 @@ const (
// VersionMajor is for an API incompatible changes // VersionMajor is for an API incompatible changes
VersionMajor = 0 VersionMajor = 0
// VersionMinor is for functionality in a backwards-compatible manner // VersionMinor is for functionality in a backwards-compatible manner
VersionMinor = 3 VersionMinor = 5
// VersionPatch is for backwards-compatible bug fixes // VersionPatch is for backwards-compatible bug fixes
VersionPatch = 0 VersionPatch = 0