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

Update layer apply to use containerd archive

Browse source 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
This commit is contained in:
Derek McGowan 2017-02-07 17:01:43 -08:00
parent 0deba01621
commit f0a43e72cd
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmd/dist/apply.go vendored
View file

@ -4,8 +4,9 @@ import (
contextpkg "context" contextpkg "context"
"os" "os"
"github.com/docker/containerd/archive"
"github.com/docker/containerd/log" "github.com/docker/containerd/log"
"github.com/docker/docker/pkg/archive" dockerarchive "github.com/docker/docker/pkg/archive"
"github.com/urfave/cli" "github.com/urfave/cli"
) )
@ -21,7 +22,13 @@ var applyCommand = cli.Command{
) )
log.G(ctx).Info("applying layer from stdin") log.G(ctx).Info("applying layer from stdin")
if _, err := archive.ApplyLayer(dir, os.Stdin); err != nil {
rd, err := dockerarchive.DecompressStream(os.Stdin)
if err != nil {
return err
}
if _, err := archive.ApplyDiffTar(ctx, dir, rd); err != nil {
return err return err
} }

11
rootfs/apply.go
View file

@ -1,13 +1,15 @@
package rootfs package rootfs
import ( import (
"context"
"io" "io"
"io/ioutil" "io/ioutil"
"github.com/docker/containerd" "github.com/docker/containerd"
"github.com/docker/containerd/archive"
"github.com/docker/containerd/log" "github.com/docker/containerd/log"
"github.com/docker/containerd/snapshot" "github.com/docker/containerd/snapshot"
"github.com/docker/docker/pkg/archive" dockerarchive "github.com/docker/docker/pkg/archive"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@ -56,7 +58,12 @@ func ApplyLayer(snapshots snapshot.Snapshotter, mounter Mounter, rd io.Reader, p
} }
defer mounter.Unmount(mounts...) defer mounter.Unmount(mounts...)
if _, err := archive.ApplyLayer(key, rd); err != nil { rd, err = dockerarchive.DecompressStream(rd)
if err != nil {
return "", err
}
if _, err := archive.ApplyDiffTar(context.Background(), key, rd); err != nil {
return "", err return "", err
} }