From b07668418d92ecb5073e4c1bf49d394442ea8344 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 5 Nov 2020 17:22:56 +0900 Subject: [PATCH] update RootlessKit, fuse-overlayfs, and containerd-fuse-overlayfs Changes: - https://github.com/rootless-containers/rootlesskit/compare/v0.9.5...v0.11.0 - https://github.com/containers/fuse-overlayfs/compare/v1.1.2...v1.2.0 - https://github.com/AkihiroSuda/containerd-fuse-overlayfs/compare/v0.10.0...v1.0.0 Signed-off-by: Akihiro Suda --- Dockerfile | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- .../containerd-fuse-overlayfs/Dockerfile | 4 ++-- .../containerd-fuse-overlayfs/README.md | 3 ++- .../containerd-fuse-overlayfs/fuseoverlayfs.go | 14 -------------- vendor/modules.txt | 2 +- 7 files changed, 10 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 15351952..f1db58c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,10 +8,10 @@ ARG CONTAINERD_ALT_VERSION=v1.3.7 # available targets: buildkitd, buildkitd.oci_only, buildkitd.containerd_only ARG BUILDKIT_TARGET=buildkitd ARG REGISTRY_VERSION=2.7.1 -ARG ROOTLESSKIT_VERSION=v0.9.5 +ARG ROOTLESSKIT_VERSION=v0.11.0 ARG CNI_VERSION=v0.8.6 ARG SHADOW_VERSION=4.8.1 -ARG FUSEOVERLAYFS_VERSION=v1.1.2 +ARG FUSEOVERLAYFS_VERSION=v1.2.0 ARG STARGZ_SNAPSHOTTER_VERSION=3a04e4c2c116c85b4b66d01945cf7ebcb7a2eb5a # git stage is used for checking out remote repository sources diff --git a/go.mod b/go.mod index 7e32bcd2..866cc243 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/moby/buildkit go 1.13 require ( - github.com/AkihiroSuda/containerd-fuse-overlayfs v0.10.0 + github.com/AkihiroSuda/containerd-fuse-overlayfs v1.0.0 github.com/BurntSushi/toml v0.3.1 github.com/Microsoft/go-winio v0.4.15-0.20200908182639-5b44b70ab3ab github.com/Microsoft/hcsshim v0.8.9 diff --git a/go.sum b/go.sum index 18d9b5f4..96eca04e 100644 --- a/go.sum +++ b/go.sum @@ -44,8 +44,8 @@ contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcig dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= -github.com/AkihiroSuda/containerd-fuse-overlayfs v0.10.0 h1:WUnAvVmHctWgTblykFsbRk5KwMv5z2db8bRxyKcJTKc= -github.com/AkihiroSuda/containerd-fuse-overlayfs v0.10.0/go.mod h1:0mMDvQFeLbbn1Wy8P2j3hwFhqBq+FKn8OZPno8WLmp8= +github.com/AkihiroSuda/containerd-fuse-overlayfs v1.0.0 h1:LhS8BiMh7ULa6zkkF5XI6piLV5XVTR7mSm9j3hTUB/k= +github.com/AkihiroSuda/containerd-fuse-overlayfs v1.0.0/go.mod h1:0mMDvQFeLbbn1Wy8P2j3hwFhqBq+FKn8OZPno8WLmp8= github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuEd+YuKoUiazDC/N96FiDEU= github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= diff --git a/vendor/github.com/AkihiroSuda/containerd-fuse-overlayfs/Dockerfile b/vendor/github.com/AkihiroSuda/containerd-fuse-overlayfs/Dockerfile index 1cf7f249..4f7f2f10 100644 --- a/vendor/github.com/AkihiroSuda/containerd-fuse-overlayfs/Dockerfile +++ b/vendor/github.com/AkihiroSuda/containerd-fuse-overlayfs/Dockerfile @@ -1,5 +1,5 @@ -ARG FUSEOVERLAYFS_COMMIT=v1.1.2 -ARG ROOTLESSKIT_COMMIT=v0.10.0 +ARG FUSEOVERLAYFS_COMMIT=v1.2.0 +ARG ROOTLESSKIT_COMMIT=v0.11.0 ARG SHADOW_COMMIT=4.8.1 FROM golang:1.15-alpine AS containerd-fuse-overlayfs-test diff --git a/vendor/github.com/AkihiroSuda/containerd-fuse-overlayfs/README.md b/vendor/github.com/AkihiroSuda/containerd-fuse-overlayfs/README.md index fdda6366..02e73d26 100644 --- a/vendor/github.com/AkihiroSuda/containerd-fuse-overlayfs/README.md +++ b/vendor/github.com/AkihiroSuda/containerd-fuse-overlayfs/README.md @@ -36,7 +36,8 @@ with the following content, and recompile the containerd binary: package main -import _ "github.com/AkihiroSuda/containerd-fuse-overlayfs" +// NOTE: the package name was "github.com/AkihiroSuda/containerd-fuse-overlayfs" before v1.0.0 +import _ "github.com/AkihiroSuda/containerd-fuse-overlayfs/plugin" ``` No extra configuration is needed. diff --git a/vendor/github.com/AkihiroSuda/containerd-fuse-overlayfs/fuseoverlayfs.go b/vendor/github.com/AkihiroSuda/containerd-fuse-overlayfs/fuseoverlayfs.go index 09c014ad..dfaf5d27 100644 --- a/vendor/github.com/AkihiroSuda/containerd-fuse-overlayfs/fuseoverlayfs.go +++ b/vendor/github.com/AkihiroSuda/containerd-fuse-overlayfs/fuseoverlayfs.go @@ -29,8 +29,6 @@ import ( "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" "github.com/containerd/continuity/fs" @@ -41,18 +39,6 @@ const ( fuseoverlayfsBinary = "fuse-overlayfs" ) -func init() { - plugin.Register(&plugin.Registration{ - Type: plugin.SnapshotPlugin, - ID: "fuse-overlayfs", - InitFn: func(ic *plugin.InitContext) (interface{}, error) { - ic.Meta.Platforms = append(ic.Meta.Platforms, platforms.DefaultSpec()) - ic.Meta.Exports["root"] = ic.Root - return NewSnapshotter(ic.Root) - }, - }) -} - // SnapshotterConfig is used to configure the overlay snapshotter instance type SnapshotterConfig struct { asyncRemove bool diff --git a/vendor/modules.txt b/vendor/modules.txt index 4e2bada2..212737a0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# github.com/AkihiroSuda/containerd-fuse-overlayfs v0.10.0 +# github.com/AkihiroSuda/containerd-fuse-overlayfs v1.0.0 github.com/AkihiroSuda/containerd-fuse-overlayfs # github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 github.com/Azure/go-ansiterm