github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1013 from AkihiroSuda/oci-export

Browse Source 
client: add Import() and Export() for importing/exporting image in OCI format
This commit is contained in:
Michael Crosby
2017-07-28 09:22:22 -04:00
committed by GitHub
parent 1a054c67b1 b518f11dba
commit 183a6ca888
13 changed files with 904 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
content/content.go
View File

@@ -5,6 +5,7 @@ import (
"io"
"time"
"github.com/containerd/containerd/oci"
"github.com/opencontainers/go-digest"
)
@@ -77,10 +78,8 @@ type IngestManager interface {
}
type Writer interface {
io.WriteCloser
oci.BlobWriter
Status() (Status, error)
Digest() digest.Digest
Commit(size int64, expected digest.Digest) error
Truncate(size int64) error
}

5
content/local/writer.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/oci"
"github.com/opencontainers/go-digest"
"github.com/pkg/errors"
)
@@ -78,7 +79,7 @@ func (w *writer) Commit(size int64, expected digest.Digest) error {
}
if size > 0 && size != fi.Size() {
return errors.Errorf("%q failed size validation: %v != %v", w.ref, fi.Size(), size)
return oci.ErrUnexpectedSize{Expected: size, Actual: fi.Size()}
}
if err := w.fp.Close(); err != nil {
@@ -87,7 +88,7 @@ func (w *writer) Commit(size int64, expected digest.Digest) error {
dgst := w.digester.Digest()
if expected != "" && expected != dgst {
return errors.Errorf("unexpected digest: %v != %v", dgst, expected)
return oci.ErrUnexpectedDigest{Expected: expected, Actual: dgst}
}
var (