Merge pull request opencontainers#121 from q384566678/bump-version

Update version

cmd/oci-image-validate/main.go

@@ -37,7 +37,7 @@ var validateTypes = []string{
 	image.TypeImageLayout,
 	image.TypeImage,
 	image.TypeManifest,
-	image.TypeManifestList,
+	image.TypeImageIndex,
 	image.TypeConfig,
 }
 
@@ -181,11 +181,11 @@ func (v *validateCmd) validatePath(name string) error {
 
 	switch typ {
 	case image.TypeManifest:
-		return schema.MediaTypeManifest.Validate(f)
-	case image.TypeManifestList:
-		return schema.MediaTypeManifestList.Validate(f)
+		return schema.ValidatorMediaTypeManifest.Validate(f)
+	case image.TypeImageIndex:
+		return schema.ValidatorMediaTypeImageIndex.Validate(f)
 	case image.TypeConfig:
-		return schema.MediaTypeImageConfig.Validate(f)
+		return schema.ValidatorMediaTypeImageConfig.Validate(f)
 	}
 
 	return fmt.Errorf("type %q unimplemented", typ)

glide.yaml

@@ -3,12 +3,12 @@ import:
 - package: github.com/opencontainers/go-digest
   version: v1.0.0-rc0
 - package: github.com/opencontainers/image-spec
-  version: v1.0.0-rc4
+  version: v1.0.0-rc5
   subpackages:
   - schema
   - specs-go/v1
 - package: github.com/opencontainers/runtime-spec
-  version: v1.0.0-rc3
+  version: v1.0.0-rc4
   subpackages:
   - specs-go
 - package: github.com/pkg/errors

image/autodetect.go

@@ -27,11 +27,11 @@ import (
 
 // supported autodetection types
 const (
-	TypeImageLayout  = "imageLayout"
-	TypeImage        = "image"
-	TypeManifest     = "manifest"
-	TypeManifestList = "manifestList"
-	TypeConfig       = "config"
+	TypeImageLayout = "imageLayout"
+	TypeImage       = "image"
+	TypeManifest    = "manifest"
+	TypeImageIndex  = "imageIndex"
+	TypeConfig      = "config"
 )
 
 // Autodetect detects the validation type for the given path
@@ -94,11 +94,11 @@ func Autodetect(path string) (string, error) {
 	}
 
 	switch {
-	case header.MediaType == string(schema.MediaTypeManifest):
+	case header.MediaType == string(schema.ValidatorMediaTypeManifest):
 		return TypeManifest, nil
 
-	case header.MediaType == string(schema.MediaTypeManifestList):
-		return TypeManifestList, nil
+	case header.MediaType == string(schema.ValidatorMediaTypeImageIndex):
+		return TypeImageIndex, nil
 
 	case header.MediaType == "" && header.SchemaVersion == 0 && header.Config != nil:
 		// config files don't have mediaType/schemaVersion header

image/config.go

@@ -46,7 +46,7 @@ func findConfig(w walker, d *descriptor) (*config, error) {
 			return errors.Wrapf(err, "%s: error reading config", path)
 		}
 
-		if err := schema.MediaTypeImageConfig.Validate(bytes.NewReader(buf)); err != nil {
+		if err := schema.ValidatorMediaTypeImageConfig.Validate(bytes.NewReader(buf)); err != nil {
 			return errors.Wrapf(err, "%s: config validation failed", path)
 		}
 

image/image.go

@@ -45,7 +45,7 @@ func Validate(tarFile string, refs []string, out *log.Logger) error {
 
 var validRefMediaTypes = []string{
 	v1.MediaTypeImageManifest,
-	v1.MediaTypeImageManifestList,
+	v1.MediaTypeImageIndex,
 }
 
 func validate(w walker, refs []string, out *log.Logger) error {

image/manifest.go

@@ -51,7 +51,7 @@ func findManifest(w walker, d *descriptor) (*manifest, error) {
 			return errors.Wrapf(err, "%s: error reading manifest", path)
 		}
 
-		if err := schema.MediaTypeManifest.Validate(bytes.NewReader(buf)); err != nil {
+		if err := schema.ValidatorMediaTypeManifest.Validate(bytes.NewReader(buf)); err != nil {
 			return errors.Wrapf(err, "%s: manifest validation failed", path)
 		}