Merge pull request #55 from AkihiroSuda/dev

Update dependencies

.github/workflows/main.yml

@@ -13,8 +13,8 @@ jobs:
     steps:
     - uses: actions/setup-go@v4
       with:
-        go-version: 1.20.x
-    - uses: actions/checkout@v3
+        go-version: 1.21.x
+    - uses: actions/checkout@v4
       with:
         path: src/github.com/containerd/fuse-overlayfs-snapshotter
         fetch-depth: 25
@@ -28,11 +28,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        fuse-overlayfs: [v1.0.0, v1.11, main]
+        fuse-overlayfs: [v1.0.0, v1.13, main]
     env:
       FUSEOVERLAYFS_COMMIT: "${{ matrix.fuse-overlayfs }}"
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: make test
 
   cross:
@@ -41,6 +41,6 @@ jobs:
     steps:
     - uses: actions/setup-go@v4
       with:
-        go-version: 1.20.x
-    - uses: actions/checkout@v3
+        go-version: 1.21.x
+    - uses: actions/checkout@v4
     - run: make artifacts

.github/workflows/release.yml

@@ -13,8 +13,8 @@ jobs:
     steps:
     - uses: actions/setup-go@v4
       with:
-        go-version: 1.20.x
-    - uses: actions/checkout@v3
+        go-version: 1.21.x
+    - uses: actions/checkout@v4
       with:
         path: go/src/github.com/containerd/fuse-overlayfs-snapshotter
     - name: "Compile binaries"

check.go

@@ -26,8 +26,8 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
+	"github.com/containerd/log"
 )
 
 // supportsReadonlyMultipleLowerDir checks if read-only multiple lowerdirs can be mounted with fuse-overlayfs.

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

@@ -22,20 +22,18 @@ import (
 	"os"
 	"path/filepath"
 
-	sddaemon "github.com/coreos/go-systemd/v22/daemon"
-	"github.com/sirupsen/logrus"
-	"google.golang.org/grpc"
-
 	snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1"
 	"github.com/containerd/containerd/contrib/snapshotservice"
-
 	fuseoverlayfs "github.com/containerd/fuse-overlayfs-snapshotter"
 	"github.com/containerd/fuse-overlayfs-snapshotter/cmd/containerd-fuse-overlayfs-grpc/version"
+	"github.com/containerd/log"
+	sddaemon "github.com/coreos/go-systemd/v22/daemon"
+	"google.golang.org/grpc"
 )
 
 // main is from https://github.com/containerd/containerd/blob/b9fad5e310fafb453def5f1e7094f4c36a9806d2/PLUGINS.md
 func main() {
-	logrus.Infof("containerd-fuse-overlayfs-grpc Version=%q Revision=%q", version.Version, version.Revision)
+	log.L.Infof("containerd-fuse-overlayfs-grpc Version=%q Revision=%q", version.Version, version.Revision)
 	// Provide a unix address to listen to, this will be the `address`
 	// in the `proxy_plugin` configuration.
 	// The root will be used to store the snapshots.

fuseoverlayfs.go

@@ -28,11 +28,11 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/containerd/snapshots/storage"
 	"github.com/containerd/continuity/fs"
+	"github.com/containerd/log"
 )
 
 const (

go.mod

@@ -1,43 +1,46 @@
 module github.com/containerd/fuse-overlayfs-snapshotter
 
-go 1.19
-
-// The test suite from containerd v1.7.x is not compatible with fuse-overlayfs:
-// https://github.com/containerd/fuse-overlayfs-snapshotter/pull/53#issuecomment-1543442048
-// Expected to be fixed in v1.7.2 (https://github.com/containerd/containerd/pull/8507)
+go 1.20
 
 require (
-	github.com/containerd/containerd v1.6.21
-	github.com/containerd/continuity v0.3.0
+	github.com/containerd/containerd v1.7.6
+	github.com/containerd/continuity v0.4.2
+	github.com/containerd/log v0.1.0
 	github.com/coreos/go-systemd/v22 v22.5.0
-	github.com/sirupsen/logrus v1.9.0
-	google.golang.org/grpc v1.55.0
+	google.golang.org/grpc v1.58.2
 )
 
 require (
 	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/Microsoft/hcsshim v0.9.9 // indirect
+	github.com/Microsoft/hcsshim v0.11.0 // indirect
 	github.com/containerd/cgroups v1.1.0 // indirect
 	github.com/containerd/ttrpc v1.2.2 // indirect
-	github.com/containerd/typeurl v1.0.2 // indirect
+	github.com/containerd/typeurl/v2 v2.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/moby/sys/mountinfo v0.6.2 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/stretchr/testify v1.8.2 // indirect
 	go.etcd.io/bbolt v1.3.7 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/sync v0.2.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/net v0.16.0 // indirect
+	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/tools v0.9.1 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
-	gotest.tools/v3 v3.4.0 // indirect
+	google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )