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

expose blob size

Browse Source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-06-15 19:08:04 +02:00
parent a50211ce2a
commit 7769a21cef
6 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/skopeo/copy.go
View File

@ -65,7 +65,8 @@ func copyHandler(context *cli.Context) {
logrus.Fatalf("Error parsing manifest: %s", err.Error())
}
for _, layer := range layers {
stream, err := src.GetBlob(layer)
// TODO(mitr): do not ignore the size param returned here
stream, _, err := src.GetBlob(layer)
if err != nil {
logrus.Fatalf("Error reading layer %s: %s", layer, err.Error())
}

12
directory/directory.go
View File

@ -93,8 +93,16 @@ func (s *dirImageSource) GetManifest(_ []string) ([]byte, string, error) {
return m, "", err
}
func (s *dirImageSource) GetBlob(digest string) (io.ReadCloser, error) {
return os.Open(layerPath(s.dir, digest))
func (s *dirImageSource) GetBlob(digest string) (io.ReadCloser, int64, error) {
r, err := os.Open(layerPath(s.dir, digest))
if err != nil {
return nil, 0, nil
}
fi, err := os.Stat(layerPath(s.dir, digest))
if err != nil {
return nil, 0, nil
}
return r, fi.Size(), nil
}
func (s *dirImageSource) GetSignatures() ([][]byte, error) {

13
docker/docker_image_src.go
View File

@ -5,6 +5,7 @@ import (
"io"
"io/ioutil"
"net/http"
"strconv"
"github.com/Sirupsen/logrus"
"github.com/projectatomic/skopeo/docker/utils"
@ -78,18 +79,22 @@ func (s *dockerImageSource) GetManifest(mimetypes []string) ([]byte, string, err
return manblob, res.Header.Get("Content-Type"), nil
}
func (s *dockerImageSource) GetBlob(digest string) (io.ReadCloser, error) {
func (s *dockerImageSource) GetBlob(digest string) (io.ReadCloser, int64, error) {
url := fmt.Sprintf(blobsURL, s.ref.RemoteName(), digest)
logrus.Infof("Downloading %s", url)
res, err := s.c.makeRequest("GET", url, nil, nil)
if err != nil {
return nil, err
return nil, 0, err
}
if res.StatusCode != http.StatusOK {
// print url also
return nil, fmt.Errorf("Invalid status code returned when fetching blob %d", res.StatusCode)
return nil, 0, fmt.Errorf("Invalid status code returned when fetching blob %d", res.StatusCode)
}
return res.Body, nil
size, err := strconv.ParseInt(res.Header.Get("Content-Length"), 10, 64)
if err != nil {
size = 0
}
return res.Body, size, nil
}
func (s *dockerImageSource) GetSignatures() ([][]byte, error) {

2
image/image.go
View File

@ -204,7 +204,7 @@ func (i *genericImage) Layers(layers ...string) error {
}
func (i *genericImage) getLayer(dest types.ImageDestination, digest string) error {
stream, err := i.src.GetBlob(digest)
stream, _, err := i.src.GetBlob(digest)
if err != nil {
return err
}

4
openshift/openshift.go
View File

@ -200,9 +200,9 @@ func (s *openshiftImageSource) GetManifest(mimetypes []string) ([]byte, string,
return s.docker.GetManifest(mimetypes)
}
func (s *openshiftImageSource) GetBlob(digest string) (io.ReadCloser, error) {
func (s *openshiftImageSource) GetBlob(digest string) (io.ReadCloser, int64, error) {
if err := s.ensureImageIsResolved(); err != nil {
return nil, err
return nil, 0, err
}
return s.docker.GetBlob(digest)
}

3
types/types.go
View File

@ -30,7 +30,8 @@ type ImageSource interface {
// It may use a remote (= slow) service.
GetManifest([]string) ([]byte, string, error)
// Note: Calling GetBlob() may have ordering dependencies WRT other methods of this type. FIXME: How does this work with (docker save) on stdin?
GetBlob(digest string) (io.ReadCloser, error)
// the second return value is the size of the blob. If not known 0 is returned
GetBlob(digest string) (io.ReadCloser, int64, error)
// GetSignatures returns the image's signatures. It may use a remote (= slow) service.
GetSignatures() ([][]byte, error)
// Delete image from registry, if operation is supported