Merge pull request #100 from AkihiroSuda/dev

go.mod: module github.com/containerd/fuse-overlayfs-snapshotter/v2

Dockerfile

@@ -24,6 +24,7 @@ COPY . /go/src/github.com/containerd/fuse-overlayfs-snapshotter
 WORKDIR  /go/src/github.com/containerd/fuse-overlayfs-snapshotter
 ENV CGO_ENABLED=0
 ENV GO111MODULE=on
+RUN go build ./...
 RUN mkdir /out && go test -c -o /out/containerd-fuse-overlayfs.test
 
 # from https://github.com/containers/fuse-overlayfs/blob/53c17dab78b43de1cd121bf9260b20b76371bbaf/Dockerfile.static.ubuntu

Makefile

@@ -31,8 +31,8 @@ VERSION ?= $(shell $(GIT) describe --match 'v[0-9]*' --dirty='.m' --always --tag
 VERSION_TRIMMED := $(VERSION:v%=%)
 REVISION ?= $(shell $(GIT) rev-parse HEAD)$(shell if ! $(GIT) diff --no-ext-diff --quiet --exit-code; then $(ECHO) .m; fi)
 
-PKG_MAIN := github.com/containerd/fuse-overlayfs-snapshotter/cmd/$(TARGET_BIN)
-PKG_VERSION := github.com/containerd/fuse-overlayfs-snapshotter/cmd/$(TARGET_BIN)/version
+PKG_MAIN := github.com/containerd/fuse-overlayfs-snapshotter/v2/cmd/$(TARGET_BIN)
+PKG_VERSION := github.com/containerd/fuse-overlayfs-snapshotter/v2/cmd/$(TARGET_BIN)/version
 
 export GO_BUILD=GO111MODULE=on CGO_ENABLED=0 $(GO) build -ldflags "-s -w -X $(PKG_VERSION).Version=$(VERSION) -X $(PKG_VERSION).Revision=$(REVISION)"
 

README.md

@@ -23,7 +23,7 @@ Choose 1 if you don't mind recompiling containerd, otherwise choose 2.
 
 ### Option 1: Embed `fuse-overlayfs` plugin into the containerd binary
 
-Create `builtins_fuseoverlayfs_linux.go` under [`$GOPATH/src/github.com/containerd/containerd/cmd/containerd`](https://github.com/containerd/containerd/tree/master/cmd/containerd)
+Create `builtins_fuseoverlayfs_linux.go` under [`$GOPATH/src/github.com/containerd/containerd/cmd/containerd/builtins`](https://github.com/containerd/containerd/tree/master/cmd/containerd/builtins)
 with the following content, and recompile the containerd binary:
 
 ```go
@@ -45,7 +45,7 @@ with the following content, and recompile the containerd binary:
 
 package main
 
-import _ "github.com/containerd/fuse-overlayfs-snapshotter/plugin"
+import _ "github.com/containerd/fuse-overlayfs-snapshotter/v2/plugin"
 ```
 
 No extra configuration is needed.

cmd/containerd-fuse-overlayfs-grpc/main.go

@@ -24,8 +24,8 @@ import (
 
 	snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1"
 	"github.com/containerd/containerd/v2/contrib/snapshotservice"
-	fuseoverlayfs "github.com/containerd/fuse-overlayfs-snapshotter"
-	"github.com/containerd/fuse-overlayfs-snapshotter/cmd/containerd-fuse-overlayfs-grpc/version"
+	fuseoverlayfs "github.com/containerd/fuse-overlayfs-snapshotter/v2"
+	"github.com/containerd/fuse-overlayfs-snapshotter/v2/cmd/containerd-fuse-overlayfs-grpc/version"
 	"github.com/containerd/log"
 	sddaemon "github.com/coreos/go-systemd/v22/daemon"
 	"google.golang.org/grpc"

go.mod

@@ -1,4 +1,4 @@
-module github.com/containerd/fuse-overlayfs-snapshotter
+module github.com/containerd/fuse-overlayfs-snapshotter/v2
 
 go 1.22.0
 

plugin/plugin.go

@@ -22,9 +22,11 @@ package fuseoverlayfs
 import (
 	"errors"
 
-	fuseoverlayfs "github.com/containerd/fuse-overlayfs-snapshotter"
+	"github.com/containerd/containerd/v2/plugins"
+	fuseoverlayfs "github.com/containerd/fuse-overlayfs-snapshotter/v2"
 	"github.com/containerd/platforms"
 	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 )
 
 // Config represents configuration for the fuse-overlayfs plugin.
@@ -34,8 +36,8 @@ type Config struct {
 }
 
 func init() {
-	plugin.Register(&plugin.Registration{
-		Type:   plugin.SnapshotPlugin,
+	registry.Register(&plugin.Registration{
+		Type:   plugins.SnapshotPlugin,
 		ID:     "fuse-overlayfs",
 		Config: &Config{},
 		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
@@ -46,7 +48,7 @@ func init() {
 				return nil, errors.New("invalid fuse-overlayfs configuration")
 			}
 
-			root := ic.Root
+			root := ic.Properties[plugins.PropertyRootDir]
 			if config.RootPath != "" {
 				root = config.RootPath
 			}