*: use types from specs-go/

Signed-off-by: Antonio Murdaca <[email protected]>

Author: runcom

image/config.go

@@ -26,28 +26,12 @@ import (
 	"strings"
 
 	"github.com/opencontainers/image-spec/schema"
+	"github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 )
 
-type cfg struct {
-	User         string
-	Memory       int64
-	MemorySwap   int64
-	CPUShares    int64 `json:"CpuShares"`
-	ExposedPorts map[string]struct{}
-	Env          []string
-	Entrypoint   []string
-	Cmd          []string
-	Volumes      map[string]struct{}
-	WorkingDir   string
-}
-
-type config struct {
-	Architecture string `json:"architecture"`
-	OS           string `json:"os"`
-	Config       cfg    `json:"config"`
-}
+type config v1.Image
 
 func findConfig(w walker, d *descriptor) (*config, error) {
 	var c config

schema/schema.go

@@ -14,15 +14,19 @@
 
 package schema
 
-import "net/http"
+import (
+	"net/http"
+
+	"github.com/opencontainers/image-spec/specs-go/v1"
+)
 
 // Media types for the OCI image formats
 const (
-	MediaTypeDescriptor   Validator     = `application/vnd.oci.descriptor.v1+json`
-	MediaTypeManifest     Validator     = `application/vnd.oci.image.manifest.v1+json`
-	MediaTypeManifestList Validator     = `application/vnd.oci.image.manifest.list.v1+json`
-	MediaTypeImageConfig  Validator     = `application/vnd.oci.image.config.v1+json`
-	MediaTypeImageLayer   unimplemented = `application/vnd.oci.image.layer.tar+gzip`
+	MediaTypeDescriptor   Validator     = v1.MediaTypeDescriptor
+	MediaTypeManifest     Validator     = v1.MediaTypeImageManifest
+	MediaTypeManifestList Validator     = v1.MediaTypeImageManifestList
+	MediaTypeImageConfig  Validator     = v1.MediaTypeImageConfig
+	MediaTypeImageLayer   unimplemented = v1.MediaTypeImageLayer
 )
 
 var (