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

Merge pull request #101 from projectatomic/oci-prep-1

Browse Source 
Generalize [Get|Put]Layer
This commit is contained in:
Antonio Murdaca 2016-06-14 14:01:16 +02:00 committed by GitHub
commit a50211ce2a
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/skopeo/copy.go
View File

@ -65,12 +65,12 @@ func copyHandler(context *cli.Context) {
logrus.Fatalf("Error parsing manifest: %s", err.Error()) logrus.Fatalf("Error parsing manifest: %s", err.Error())
} }
for _, layer := range layers { for _, layer := range layers {
stream, err := src.GetLayer(layer) stream, err := src.GetBlob(layer)
if err != nil { if err != nil {
logrus.Fatalf("Error reading layer %s: %s", layer, err.Error()) logrus.Fatalf("Error reading layer %s: %s", layer, err.Error())
} }
defer stream.Close() defer stream.Close()
if err := dest.PutLayer(layer, stream); err != nil { if err := dest.PutBlob(layer, stream); err != nil {
logrus.Fatalf("Error writing layer: %s", err.Error()) logrus.Fatalf("Error writing layer: %s", err.Error())
} }
} }
@ -101,7 +101,7 @@ func copyHandler(context *cli.Context) {
logrus.Fatalf("Error writing signatures: %s", err.Error()) logrus.Fatalf("Error writing signatures: %s", err.Error())
} }
// FIXME: We need to call PutManifest after PutLayer and PutSignatures. This seems ugly; move to a "set properties" + "commit" model? // FIXME: We need to call PutManifest after PutBlob and PutSignatures. This seems ugly; move to a "set properties" + "commit" model?
if err := dest.PutManifest(manifest); err != nil { if err := dest.PutManifest(manifest); err != nil {
logrus.Fatalf("Error writing manifest: %s", err.Error()) logrus.Fatalf("Error writing manifest: %s", err.Error())
} }

4
directory/directory.go
View File

@ -44,7 +44,7 @@ func (d *dirImageDestination) PutManifest(manifest []byte) error {
return ioutil.WriteFile(manifestPath(d.dir), manifest, 0644) return ioutil.WriteFile(manifestPath(d.dir), manifest, 0644)
} }
func (d *dirImageDestination) PutLayer(digest string, stream io.Reader) error { func (d *dirImageDestination) PutBlob(digest string, stream io.Reader) error {
layerFile, err := os.Create(layerPath(d.dir, digest)) layerFile, err := os.Create(layerPath(d.dir, digest))
if err != nil { if err != nil {
return err return err
@ -93,7 +93,7 @@ func (s *dirImageSource) GetManifest(_ []string) ([]byte, string, error) {
return m, "", err return m, "", err
} }
func (s *dirImageSource) GetLayer(digest string) (io.ReadCloser, error) { func (s *dirImageSource) GetBlob(digest string) (io.ReadCloser, error) {
return os.Open(layerPath(s.dir, digest)) return os.Open(layerPath(s.dir, digest))
} }

2
docker/docker_image_dest.go
View File

@ -70,7 +70,7 @@ func (d *dockerImageDestination) PutManifest(manifest []byte) error {
return nil return nil
} }
func (d *dockerImageDestination) PutLayer(digest string, stream io.Reader) error { func (d *dockerImageDestination) PutBlob(digest string, stream io.Reader) error {
checkURL := fmt.Sprintf(blobsURL, d.ref.RemoteName(), digest) checkURL := fmt.Sprintf(blobsURL, d.ref.RemoteName(), digest)
logrus.Debugf("Checking %s", checkURL) logrus.Debugf("Checking %s", checkURL)

2
docker/docker_image_src.go
View File

@ -78,7 +78,7 @@ func (s *dockerImageSource) GetManifest(mimetypes []string) ([]byte, string, err
return manblob, res.Header.Get("Content-Type"), nil return manblob, res.Header.Get("Content-Type"), nil
} }
func (s *dockerImageSource) GetLayer(digest string) (io.ReadCloser, error) { func (s *dockerImageSource) GetBlob(digest string) (io.ReadCloser, error) {
url := fmt.Sprintf(blobsURL, s.ref.RemoteName(), digest) url := fmt.Sprintf(blobsURL, s.ref.RemoteName(), digest)
logrus.Infof("Downloading %s", url) logrus.Infof("Downloading %s", url)
res, err := s.c.makeRequest("GET", url, nil, nil) res, err := s.c.makeRequest("GET", url, nil, nil)

4
image/image.go
View File

@ -204,12 +204,12 @@ func (i *genericImage) Layers(layers ...string) error {
} }
func (i *genericImage) getLayer(dest types.ImageDestination, digest string) error { func (i *genericImage) getLayer(dest types.ImageDestination, digest string) error {
stream, err := i.src.GetLayer(digest) stream, err := i.src.GetBlob(digest)
if err != nil { if err != nil {
return err return err
} }
defer stream.Close() defer stream.Close()
return dest.PutLayer(digest, stream) return dest.PutBlob(digest, stream)
} }
// fixManifestLayers, after validating the supplied manifest // fixManifestLayers, after validating the supplied manifest

8
openshift/openshift.go
View File

@ -200,11 +200,11 @@ func (s *openshiftImageSource) GetManifest(mimetypes []string) ([]byte, string,
return s.docker.GetManifest(mimetypes) return s.docker.GetManifest(mimetypes)
} }
func (s *openshiftImageSource) GetLayer(digest string) (io.ReadCloser, error) { func (s *openshiftImageSource) GetBlob(digest string) (io.ReadCloser, error) {
if err := s.ensureImageIsResolved(); err != nil { if err := s.ensureImageIsResolved(); err != nil {
return nil, err return nil, err
} }
return s.docker.GetLayer(digest) return s.docker.GetBlob(digest)
} }
func (s *openshiftImageSource) GetSignatures() ([][]byte, error) { func (s *openshiftImageSource) GetSignatures() ([][]byte, error) {
@ -328,8 +328,8 @@ func (d *openshiftImageDestination) PutManifest(manifest []byte) error {
return d.docker.PutManifest(manifest) return d.docker.PutManifest(manifest)
} }
func (d *openshiftImageDestination) PutLayer(digest string, stream io.Reader) error { func (d *openshiftImageDestination) PutBlob(digest string, stream io.Reader) error {
return d.docker.PutLayer(digest, stream) return d.docker.PutBlob(digest, stream)
} }
func (d *openshiftImageDestination) PutSignatures(signatures [][]byte) error { func (d *openshiftImageDestination) PutSignatures(signatures [][]byte) error {

8
types/types.go
View File

@ -29,8 +29,8 @@ type ImageSource interface {
// GetManifest returns the image's manifest along with its MIME type. The empty string is returned if the MIME type is unknown. The slice parameter indicates the supported mime types the manifest should be when getting it. // GetManifest returns the image's manifest along with its MIME type. The empty string is returned if the MIME type is unknown. The slice parameter indicates the supported mime types the manifest should be when getting it.
// It may use a remote (= slow) service. // It may use a remote (= slow) service.
GetManifest([]string) ([]byte, string, error) GetManifest([]string) ([]byte, string, error)
// Note: Calling GetLayer() may have ordering dependencies WRT other methods of this type. FIXME: How does this work with (docker save) on stdin? // Note: Calling GetBlob() may have ordering dependencies WRT other methods of this type. FIXME: How does this work with (docker save) on stdin?
GetLayer(digest string) (io.ReadCloser, error) GetBlob(digest string) (io.ReadCloser, error)
// GetSignatures returns the image's signatures. It may use a remote (= slow) service. // GetSignatures returns the image's signatures. It may use a remote (= slow) service.
GetSignatures() ([][]byte, error) GetSignatures() ([][]byte, error)
// Delete image from registry, if operation is supported // Delete image from registry, if operation is supported
@ -43,8 +43,8 @@ type ImageDestination interface {
CanonicalDockerReference() (string, error) CanonicalDockerReference() (string, error)
// FIXME? This should also receive a MIME type if known, to differentiate between schema versions. // FIXME? This should also receive a MIME type if known, to differentiate between schema versions.
PutManifest([]byte) error PutManifest([]byte) error
// Note: Calling PutLayer() and other methods may have ordering dependencies WRT other methods of this type. FIXME: Figure out and document. // Note: Calling PutBlob() and other methods may have ordering dependencies WRT other methods of this type. FIXME: Figure out and document.
PutLayer(digest string, stream io.Reader) error PutBlob(digest string, stream io.Reader) error
PutSignatures(signatures [][]byte) error PutSignatures(signatures [][]byte) error
} }