github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-07-14 06:55:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #201 from runcom/fix-198

Browse Source 
vendor containers/image#84
This commit is contained in:
Antonio Murdaca 2016-09-12 17:47:00 +02:00 committed by GitHub
commit d1d1d6533e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import (
"crypto/sha256" "crypto/sha256"
"encoding/hex" "encoding/hex"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
@ -106,12 +107,12 @@ func createManifest(m []byte) ([]byte, string, error) {
om := imgspecv1.Manifest{} om := imgspecv1.Manifest{}
mt := manifest.GuessMIMEType(m) mt := manifest.GuessMIMEType(m)
switch mt { switch mt {
case manifest.DockerV2Schema1MediaType: case manifest.DockerV2Schema1MediaType, manifest.DockerV2Schema1SignedMediaType:
// There a simple reason about not yet implementing this. // There a simple reason about not yet implementing this.
// OCI image-spec assure about backward compatibility with docker v2s2 but not v2s1 // OCI image-spec assure about backward compatibility with docker v2s2 but not v2s1
// generating a v2s2 is a migration docker does when upgrading to 1.10.3 // generating a v2s2 is a migration docker does when upgrading to 1.10.3
// and I don't think we should bother about this now (I don't want to have migration code here in skopeo) // and I don't think we should bother about this now (I don't want to have migration code here in skopeo)
return nil, "", fmt.Errorf("can't create OCI manifest from Docker V2 schema 1 manifest") return nil, "", errors.New("can't create an OCI manifest from Docker V2 schema 1 manifest")
case manifest.DockerV2Schema2MediaType: case manifest.DockerV2Schema2MediaType:
if err := json.Unmarshal(m, &om); err != nil { if err := json.Unmarshal(m, &om); err != nil {
return nil, "", err return nil, "", err
@ -127,13 +128,13 @@ func createManifest(m []byte) ([]byte, string, error) {
} }
return b, om.MediaType, nil return b, om.MediaType, nil
case manifest.DockerV2ListMediaType: case manifest.DockerV2ListMediaType:
return nil, "", fmt.Errorf("can't create OCI manifest from Docker V2 schema 2 manifest list") return nil, "", errors.New("can't create an OCI manifest from Docker V2 schema 2 manifest list")
case imgspecv1.MediaTypeImageManifestList: case imgspecv1.MediaTypeImageManifestList:
return nil, "", fmt.Errorf("can't create OCI manifest from OCI manifest list") return nil, "", errors.New("can't create an OCI manifest from OCI manifest list")
case imgspecv1.MediaTypeImageManifest: case imgspecv1.MediaTypeImageManifest:
return m, mt, nil return m, mt, nil
} }
return nil, "", fmt.Errorf("Unrecognized manifest media type") return nil, "", fmt.Errorf("unrecognized manifest media type %q", mt)
} }
func (d *ociImageDestination) PutManifest(m []byte) error { func (d *ociImageDestination) PutManifest(m []byte) error {