update opencontainers/image-spec to v1.0.0-rc3

Signed-off-by: Antonio Murdaca <runcom@redhat.com>

hack/vendor.sh

@@ -28,7 +28,7 @@ clone git golang.org/x/net master https://github.com/golang/net.git
 clone git github.com/docker/distribution 07f32ac1831ed0fc71960b7da5d6bb83cb6881b5
 clone git github.com/docker/libtrust master
 clone git github.com/opencontainers/runc master
-clone git github.com/opencontainers/image-spec 7dc1ee39c59c6949612c6fdf502a4727750cb063
+clone git github.com/opencontainers/image-spec v1.0.0-rc3
 clone git github.com/mtrmac/gpgme master
 # openshift/origin' k8s dependencies as of OpenShift v1.1.5
 clone git github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed

vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go

@@ -17,34 +17,34 @@ package v1
 // ImageConfig defines the execution parameters which should be used as a base when running a container using an image.
 type ImageConfig struct {
 	// User defines the username or UID which the process in the container should run as.
-	User string `json:"User"`
+	User string `json:"User,omitempty"`
 
 	// Memory defines the memory limit.
-	Memory int64 `json:"Memory"`
+	Memory int64 `json:"Memory,omitempty"`
 
 	// MemorySwap defines the total memory usage limit (memory + swap).
-	MemorySwap int64 `json:"MemorySwap"`
+	MemorySwap int64 `json:"MemorySwap,omitempty"`
 
 	// CPUShares is the CPU shares (relative weight vs. other containers).
-	CPUShares int64 `json:"CpuShares"`
+	CPUShares int64 `json:"CpuShares,omitempty"`
 
 	// ExposedPorts a set of ports to expose from a container running this image.
-	ExposedPorts map[string]struct{} `json:"ExposedPorts"`
+	ExposedPorts map[string]struct{} `json:"ExposedPorts,omitempty"`
 
 	// Env is a list of environment variables to be used in a container.
-	Env []string `json:"Env"`
+	Env []string `json:"Env,omitempty"`
 
 	// Entrypoint defines a list of arguments to use as the command to execute when the container starts.
-	Entrypoint []string `json:"Entrypoint"`
+	Entrypoint []string `json:"Entrypoint,omitempty"`
 
 	// Cmd defines the default arguments to the entrypoint of the container.
-	Cmd []string `json:"Cmd"`
+	Cmd []string `json:"Cmd,omitempty"`
 
 	// Volumes is a set of directories which should be created as data volumes in a container running this image.
-	Volumes map[string]struct{} `json:"Volumes"`
+	Volumes map[string]struct{} `json:"Volumes,omitempty"`
 
 	// WorkingDir sets the current working directory of the entrypoint process in the container.
-	WorkingDir string `json:"WorkingDir"`
+	WorkingDir string `json:"WorkingDir,omitempty"`
 }
 
 // RootFS describes a layer content addresses
@@ -59,28 +59,28 @@ type RootFS struct {
 // History describes the history of a layer.
 type History struct {
 	// Created is the creation time.
-	Created string `json:"created"`
+	Created string `json:"created,omitempty"`
 
 	// CreatedBy is the command which created the layer.
-	CreatedBy string `json:"created_by"`
+	CreatedBy string `json:"created_by,omitempty"`
 
 	// Author is the author of the build point.
-	Author string `json:"author"`
+	Author string `json:"author,omitempty"`
 
 	// Comment is a custom message set when creating the layer.
-	Comment string `json:"comment"`
+	Comment string `json:"comment,omitempty"`
 
 	// EmptyLayer is used to mark if the history item created a filesystem diff.
-	EmptyLayer bool `json:"empty_layer"`
+	EmptyLayer bool `json:"empty_layer,omitempty"`
 }
 
 // Image is the JSON structure which describes some basic information about the image.
 type Image struct {
 	// Created defines an ISO-8601 formatted combined date and time at which the image was created.
-	Created string `json:"created"`
+	Created string `json:"created,omitempty"`
 
 	// Author defines the name and/or email address of the person or entity which created and is responsible for maintaining the image.
-	Author string `json:"author"`
+	Author string `json:"author,omitempty"`
 
 	// Architecture is the CPU architecture which the binaries in this image are built to run on.
 	Architecture string `json:"architecture"`
@@ -89,11 +89,11 @@ type Image struct {
 	OS string `json:"os"`
 
 	// Config defines the execution parameters which should be used as a base when running a container using the image.
-	Config ImageConfig `json:"config"`
+	Config ImageConfig `json:"config,omitempty"`
 
 	// RootFS references the layer content addresses used by the image.
 	RootFS RootFS `json:"rootfs"`
 
 	// History describes the history of each layer.
-	History []History `json:"history"`
+	History []History `json:"history,omitempty"`
 }

vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go

@@ -24,4 +24,7 @@ type Descriptor struct {
 
 	// Size specifies the size in bytes of the blob.
 	Size int64 `json:"size"`
+
+	// URLs specifies a list of URLs from which this object MAY be downloaded
+	URLs []string `json:"urls,omitempty"`
 }

vendor/github.com/opencontainers/image-spec/specs-go/v1/layout.go

@@ -0,0 +1,28 @@
+// Copyright 2016 The Linux Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package v1
+
+import "regexp"
+
+// ImageLayout is the structure in the "oci-layout" file, found in the root
+// of an OCI Image-layout directory.
+type ImageLayout struct {
+	Version string `json:"imageLayoutVersion"`
+}
+
+var (
+	// RefsRegexp matches requirement of image-layout 'refs' charset.
+	RefsRegexp = regexp.MustCompile(`^[a-zA-Z0-9-._]+$`)
+)

vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go

@@ -28,5 +28,5 @@ type Manifest struct {
 	Layers []Descriptor `json:"layers"`
 
 	// Annotations contains arbitrary metadata for the manifest list.
-	Annotations map[string]string `json:"annotations"`
+	Annotations map[string]string `json:"annotations,omitempty"`
 }

vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go

@@ -58,5 +58,5 @@ type ManifestList struct {
 	Manifests []ManifestDescriptor `json:"manifests"`
 
 	// Annotations contains arbitrary metadata for the manifest list.
-	Annotations map[string]string `json:"annotations"`
+	Annotations map[string]string `json:"annotations,omitempty"`
 }

vendor/github.com/opencontainers/image-spec/specs-go/version.go

@@ -18,14 +18,14 @@ import "fmt"
 
 const (
 	// VersionMajor is for an API incompatible changes
-	VersionMajor = 0
+	VersionMajor = 1
 	// VersionMinor is for functionality in a backwards-compatible manner
-	VersionMinor = 5
+	VersionMinor = 0
 	// VersionPatch is for backwards-compatible bug fixes
 	VersionPatch = 0
 
 	// VersionDev indicates development branch. Releases will be empty string.
-	VersionDev = "-dev"
+	VersionDev = "-rc3"
 )
 
 // Version is the specification version that the package types support.

vendor/github.com/opencontainers/image-spec/specs-go/versioned.go

@@ -22,5 +22,5 @@ type Versioned struct {
 	SchemaVersion int `json:"schemaVersion"`
 
 	// MediaType is the media type of this schema.
-	MediaType string `json:"mediaType,omitempty"`
+	MediaType string `json:"mediaType"`
 }