Updating containerd client to 1.2.0.

pkg/repository/build.go

@@ -79,7 +79,7 @@ func (session *Session) BuildRecipe(ctx context.Context, recipe recipes.Recipe,
 	if err != nil {
 		return newImage, err
 	}
-	defer done()
+	defer done(ctx)
 
 	// Let's create the snapshot that all of our containers will run off of
 	snapshotKey := utils.NewID()
@@ -187,7 +187,7 @@ func (session *Session) createImageFromSnapshot(ctx context.Context, img contain
 	defer session.snapshotter.Remove(ctx, "temp-readonly-parent")
 
 	// Generate a diff in content store
-	diffs, err := session.client.DiffService().DiffMounts(ctx,
+	diffs, err := session.client.DiffService().Compare(ctx,
 		lowerMounts,
 		upperMounts,
 		diff.WithMediaType(ocispec.MediaTypeImageLayerGzip),

pkg/repository/extract.go

@@ -27,7 +27,7 @@ func (session *Session) ExtractImage(ctx context.Context, imageRef reference.Ima
 	if err != nil {
 		return err
 	}
-	defer done()
+	defer done(ctx)
 
 	img, err := session.client.GetImage(ctx, imageRef.FullName())
 	if err != nil {

pkg/repository/images.go

@@ -57,7 +57,7 @@ func (session *Session) TagImage(ctx context.Context, source, destination refere
 	if err != nil {
 		return err
 	}
-	defer done()
+	defer done(ctx)
 
 	// Make sure the destination image:tag doesn't already exist.
 	destinationImage, err := session.client.GetImage(ctx, destination.FullName())

pkg/repository/manifest/manifest.go

@@ -26,7 +26,7 @@ type manifestImpl struct {
 
 // LoadManifest Load a manifest in-memory for easy interaction.
 func LoadManifest(ctx context.Context, contentStore content.Store, desc ocispec.Descriptor) (Manifest, error) {
-	p, err := content.ReadBlob(ctx, contentStore, desc.Digest)
+	p, err := content.ReadBlob(ctx, contentStore, desc)
 	if err != nil {
 		return nil, err
 	}
@@ -130,8 +130,7 @@ func (m *manifestImpl) AddLayer(ctx context.Context, contentStore content.Store,
 		contentStore,
 		"custom-ref",
 		bytes.NewReader(manifestBytes),
-		newDesc.Size,
-		newDesc.Digest,
+		newDesc,
 		content.WithLabels(labels)); err != nil {
 		return err
 	}
@@ -150,7 +149,7 @@ func patchImageConfig(ctx context.Context, contentStore content.Store, imageConf
 	result := imageConfig
 
 	// Get the current image configuration.
-	p, err := content.ReadBlob(ctx, contentStore, imageConfig.Digest)
+	p, err := content.ReadBlob(ctx, contentStore, imageConfig)
 	if err != nil {
 		return result, err
 	}
@@ -190,8 +189,7 @@ func patchImageConfig(ctx context.Context, contentStore content.Store, imageConf
 	err = content.WriteBlob(ctx, contentStore,
 		"custom-ref",
 		bytes.NewReader(p),
-		result.Size,
-		result.Digest,
+		result,
 	)
 	if err != nil {
 		return result, err

pkg/repository/session.go

@@ -3,7 +3,6 @@ package repository
 import (
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/content"
-	"github.com/containerd/containerd/diff"
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/snapshots"
 )
@@ -18,7 +17,7 @@ type Session struct {
 	client      *containerd.Client
 	snapshotter snapshots.Snapshotter
 	imagesStore images.Store
-	differ      diff.Differ
+	differ      containerd.DiffService
 	content     content.Store
 }
 

vendor.conf

@@ -1,29 +1,30 @@
+github.com/containerd/containerd c4446665cb9c30056f4998ed953e6d4ff22c7c39
 github.com/disiqueira/gotree 0.2.0
-github.com/containerd/containerd eed3b1c804bff194e2b53685a2cd95077e8aaaba
-github.com/containerd/console 84eeaae905fa414d03e07bcd6c8d3f19e7cf180e
-github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788
-github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
-github.com/gogo/protobuf v0.5
-github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9
-github.com/opencontainers/runtime-spec v1.0.1
-github.com/opencontainers/runc 9f9c96235cc97674e935002fc3d78361b696a69e
-github.com/sirupsen/logrus v1.0.0
-github.com/containerd/btrfs cc52c4dea2ce11a44e6639e561bb5c2af9ada9e3
-github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6
-github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c
-golang.org/x/net 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6
-google.golang.org/grpc v1.7.2
 github.com/pkg/errors v0.8.0
-github.com/opencontainers/go-digest 21dfd564fd89c944783d00d069f33e3e7123c448
-golang.org/x/sys 314a259e304ff91bd6985da2a7149bbf91237993 https://github.com/golang/sys
-github.com/opencontainers/image-spec v1.0.1
-github.com/containerd/continuity cf279e6ac893682272b4479d4c67fd3abf878b4e
-golang.org/x/sync 450f422ab23cf9881c94e2db30cac0eb1b7cf80c
-github.com/Microsoft/go-winio v0.4.5
+google.golang.org/grpc v1.12.0
 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
+golang.org/x/sys 1b2967e3c290b7c545b3db0deeda16e9be4f98a2 https://github.com/golang/sys
+golang.org/x/sync 450f422ab23cf9881c94e2db30cac0eb1b7cf80c
+golang.org/x/net b3756b4b77d7b13260a0a2ec658753cf48922eac
 golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
+github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c
+github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
+github.com/sirupsen/logrus v1.0.0
+github.com/opencontainers/runtime-spec eba862dc2470385a233c7507392675cbeadf7353 # v1.0.1-45-geba862d
+github.com/opencontainers/runc 58592df56734acf62e574865fe40b9e53e967910
+github.com/opencontainers/image-spec v1.0.1
+github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
+github.com/golang/protobuf v1.1.0
+github.com/gogo/protobuf v1.0.0
+github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef
 github.com/gobwas/glob 51eb1ee00b6d931c66d229ceeb7c31b985563420
-github.com/docker/docker 89658bed64c2a8fe05a978e5b87dbec409d57a0f
+github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
 github.com/docker/distribution b38e5838b7b2f2ad48e06ec4b500011976080621
-github.com/openconfig/goyang b901ade07fd91817e157c379573bb6ae52b1080b
-github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
+github.com/docker/docker 86f080cff0914e9694068ed78d503701667c4c00
+github.com/containerd/console c12b1e7919c14469339a5d38f2f8ed9b64a9de23
+github.com/containerd/continuity bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
+github.com/containerd/cri f913714917d2456d7e65a0be84962b1ce8acb487 # release/1.2 branch
+github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
+github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
+
+github.com/openconfig/goyang b901ade07fd91817e157c379573bb6ae52b1080b

vendor.conf.tmp

@@ -0,0 +1,2 @@
+github.com/containerd/containerd c4446665cb9c30056f4998ed953e6d4ff22c7c39
+github.com/disiqueira/gotree 0.2.0