Merge pull request #1885 from ktock/bump-ss2

Bump github.com/containerd/stargz-snapshotter to v0.2.0
moby · Dec 15, 2020 · 7880a4e · 7880a4e
2 parents 2211388 + ae1b79b
commit 7880a4e
Show file tree

Hide file tree

Showing 39 changed files with 2,440 additions and 596 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@ ARG ROOTLESSKIT_VERSION=v0.11.1
 ARG CNI_VERSION=v0.8.7
 ARG SHADOW_VERSION=4.8.1
 ARG FUSEOVERLAYFS_VERSION=v1.3.0
-ARG STARGZ_SNAPSHOTTER_VERSION=3a04e4c2c116c85b4b66d01945cf7ebcb7a2eb5a
+ARG STARGZ_SNAPSHOTTER_VERSION=v0.2.0
 
 ARG ALPINE_VERSION=3.12
 

diff --git a/cmd/buildkitd/main_oci_worker.go b/cmd/buildkitd/main_oci_worker.go
@@ -21,10 +21,10 @@ import (
 	"github.com/containerd/containerd/snapshots/overlay"
 	snproxy "github.com/containerd/containerd/snapshots/proxy"
 	"github.com/containerd/containerd/sys"
+	sgzfs "github.com/containerd/stargz-snapshotter/fs"
+	sgzconf "github.com/containerd/stargz-snapshotter/fs/config"
+	sgzsource "github.com/containerd/stargz-snapshotter/fs/source"
 	remotesn "github.com/containerd/stargz-snapshotter/snapshot"
-	"github.com/containerd/stargz-snapshotter/stargz"
-	sgzconf "github.com/containerd/stargz-snapshotter/stargz/config"
-	sgzsource "github.com/containerd/stargz-snapshotter/stargz/source"
 	"github.com/moby/buildkit/cmd/buildkitd/config"
 	"github.com/moby/buildkit/executor/oci"
 	"github.com/moby/buildkit/util/network/cniprovider"
@@ -377,9 +377,9 @@ func snapshotterFactory(commonRoot string, cfg config.OCIConfig, hosts docker.Re
 			}
 		}
 		snFactory.New = func(root string) (ctdsnapshot.Snapshotter, error) {
-			fs, err := stargz.NewFilesystem(filepath.Join(root, "stargz"),
+			fs, err := sgzfs.NewFilesystem(filepath.Join(root, "stargz"),
 				sgzCfg,
-				stargz.WithGetSources(
+				sgzfs.WithGetSources(
 					// provides source info based on the registry config and
 					// default labels.
 					sgzsource.FromDefaultLabels(sgzhosts),

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe
 	github.com/containerd/go-cni v1.0.1
 	github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0
-	github.com/containerd/stargz-snapshotter v0.0.0-20201027054423-3a04e4c2c116
+	github.com/containerd/stargz-snapshotter v0.2.0
 	github.com/containerd/typeurl v1.0.1
 	github.com/coreos/go-systemd/v22 v22.1.0
 	github.com/docker/cli v20.10.0-beta1.0.20201029214301-1d20b15adc38+incompatible

diff --git a/go.sum b/go.sum
diff --git a/vendor/github.com/containerd/fifo/fifo.go b/vendor/github.com/containerd/fifo/fifo.go