Merge pull request #53 from AkihiroSuda/dev

Update dependencies
containerd · May 11, 2023 · a705ae6 · a705ae6
2 parents 94a33a1 + a48f65b
commit a705ae6
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 72 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 20
     steps:
-    - uses: actions/setup-go@v3
+    - uses: actions/setup-go@v4
       with:
-        go-version: 1.19.x
+        go-version: 1.20.x
     - uses: actions/checkout@v3
       with:
         path: src/github.com/containerd/fuse-overlayfs-snapshotter
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        fuse-overlayfs: [v1.0.0, v1.9, main]
+        fuse-overlayfs: [v1.0.0, v1.11, main]
     env:
       FUSEOVERLAYFS_COMMIT: "${{ matrix.fuse-overlayfs }}"
     steps:
@@ -39,8 +39,8 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 30
     steps:
-    - uses: actions/setup-go@v3
+    - uses: actions/setup-go@v4
       with:
-        go-version: 1.19.x
+        go-version: 1.20.x
     - uses: actions/checkout@v3
     - run: make artifacts
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 20
     steps:
-    - uses: actions/setup-go@v3
+    - uses: actions/setup-go@v4
       with:
-        go-version: 1.19.x
+        go-version: 1.20.x
     - uses: actions/checkout@v3
       with:
         path: go/src/github.com/containerd/fuse-overlayfs-snapshotter

diff --git a/Dockerfile b/Dockerfile
@@ -13,11 +13,11 @@
 #   limitations under the License.
 
 ARG FUSEOVERLAYFS_COMMIT=main
-ARG ROOTLESSKIT_COMMIT=v1.0.1
+ARG ROOTLESSKIT_COMMIT=v1.1.0
 
-ARG GO_VERSION=1.19
+ARG GO_VERSION=1.20
 ARG DEBIAN_VERSION=11
-ARG ALPINE_VERSION=3.16
+ARG ALPINE_VERSION=3.18
 
 FROM golang:${GO_VERSION}-alpine AS containerd-fuse-overlayfs-test
 COPY . /go/src/github.com/containerd/fuse-overlayfs-snapshotter

diff --git a/go.mod b/go.mod
@@ -2,36 +2,42 @@ 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)
+
 require (
-	github.com/containerd/containerd v1.6.18
+	github.com/containerd/containerd v1.6.21
 	github.com/containerd/continuity v0.3.0
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/sirupsen/logrus v1.9.0
-	google.golang.org/grpc v1.50.1
+	google.golang.org/grpc v1.55.0
 )
 
 require (
-	github.com/Microsoft/go-winio v0.5.2 // indirect
-	github.com/Microsoft/hcsshim v0.9.6 // indirect
-	github.com/containerd/cgroups v1.0.4 // indirect
-	github.com/containerd/ttrpc v1.1.0 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/Microsoft/hcsshim v0.9.9 // 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/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.2 // indirect
-	github.com/google/go-cmp v0.5.6 // indirect
-	github.com/moby/sys/mountinfo v0.5.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/go-cmp v0.5.9 // 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.0.3-0.20211202183452-c5a74bcca799 // indirect
+	github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	go.etcd.io/bbolt v1.3.6 // indirect
-	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
-	google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
-	gotest.tools/v3 v3.0.3 // 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/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
 )