vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Add rootfs service

Browse source 
Add rootfs service to allow creation of rootfs from layer array

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
This commit is contained in:
Derek McGowan 2017-03-08 22:03:46 -08:00
parent 5c69a7fd6d
commit ead425f426
No known key found for this signature in database
GPG key ID: F58C5D0A4405ACDB
8 changed files with 1182 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
rootfs/apply.go
View file

@ -16,9 +16,13 @@ import (
"github.com/pkg/errors"
)
type Preparer interface {
Prepare(ctx context.Context, layers []ocispec.Descriptor) (digest.Digest, error)
}
type Mounter interface {
Mount(mounts ...containerd.Mount) error
Unmount(mounts ...containerd.Mount) error
Mount(target string, mounts ...containerd.Mount) error
Unmount(target string) error
}
// ApplyLayer applies the layer to the provided parent. The resulting snapshot
@ -51,13 +55,13 @@ func ApplyLayer(snapshots snapshot.Snapshotter, mounter Mounter, rd io.Reader, p
return "", err
}
if err := mounter.Mount(mounts...); err != nil {
if err := mounter.Mount(dir, mounts...); err != nil {
if err := snapshots.Remove(ctx, key); err != nil {
log.L.WithError(err).Error("snapshot rollback failed")
}
return "", err
}
defer mounter.Unmount(mounts...)
defer mounter.Unmount(dir)
rd, err = dockerarchive.DecompressStream(rd)
if err != nil {
@ -74,6 +78,9 @@ func ApplyLayer(snapshots snapshot.Snapshotter, mounter Mounter, rd io.Reader, p
if parent != "" {
chainID = identity.ChainID([]digest.Digest{parent, chainID})
}
if _, err := snapshots.Stat(ctx, chainID.String()); err == nil {
return diffID, nil //TODO: call snapshots.Remove(ctx, key) once implemented
}
return diffID, snapshots.Commit(ctx, chainID.String(), key)
}
@ -90,7 +97,7 @@ func Prepare(ctx context.Context, snapshots snapshot.Snapshotter, mounter Mounte
// rootfs Controller.
//
// Just pass them in for now.
openBlob func(digest.Digest) (io.ReadCloser, error),
openBlob func(context.Context, digest.Digest) (io.ReadCloser, error),
resolveDiffID func(digest.Digest) digest.Digest,
registerDiffID func(diffID, dgst digest.Digest) error) (digest.Digest, error) {
var (
@ -116,7 +123,7 @@ func Prepare(ctx context.Context, snapshots snapshot.Snapshotter, mounter Mounte
}
}
rc, err := openBlob(layerDigest)
rc, err := openBlob(ctx, layerDigest)
if err != nil {
return "", err
}