Merge pull request #44 from AkihiroSuda/dev

update deps; fix Makefile

Author: AkihiroSuda

.github/workflows/main.yml

@@ -8,12 +8,12 @@ on:
 jobs:
   project:
     name: Project Checks
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17.x
+        go-version: 1.19.x
     - uses: actions/checkout@v3
       with:
         path: src/github.com/containerd/fuse-overlayfs-snapshotter
@@ -23,24 +23,24 @@ jobs:
         working-directory: src/github.com/containerd/fuse-overlayfs-snapshotter
 
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
-        fuse-overlayfs: [v1.0.0, v1.8.2, main]
+        fuse-overlayfs: [v1.0.0, v1.9, main]
     env:
       FUSEOVERLAYFS_COMMIT: "${{ matrix.fuse-overlayfs }}"
     steps:
     - uses: actions/checkout@v3
     - run: make test
 
   cross:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 30
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17.x
+        go-version: 1.19.x
     - uses: actions/checkout@v3
     - run: make artifacts

.github/workflows/release.yml

@@ -8,12 +8,12 @@ env:
   GO111MODULE: on
 jobs:
   release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17.x
+        go-version: 1.19.x
     - uses: actions/checkout@v3
       with:
         path: go/src/github.com/containerd/fuse-overlayfs-snapshotter

Dockerfile

@@ -12,12 +12,12 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-ARG FUSEOVERLAYFS_COMMIT=master
-ARG ROOTLESSKIT_COMMIT=v0.14.6
+ARG FUSEOVERLAYFS_COMMIT=main
+ARG ROOTLESSKIT_COMMIT=v1.0.1
 
-ARG GO_VERSION=1.17
+ARG GO_VERSION=1.19
 ARG DEBIAN_VERSION=11
-ARG ALPINE_VERSION=3.15
+ARG ALPINE_VERSION=3.16
 
 FROM golang:${GO_VERSION}-alpine AS containerd-fuse-overlayfs-test
 COPY . /go/src/github.com/containerd/fuse-overlayfs-snapshotter

Makefile

@@ -84,16 +84,18 @@ ARTIFACT_NAME=containerd-fuse-overlayfs-$(VERSION_TRIMMED)
 
 artifacts: clean
 	$(MKDIR) -p _output
-	GOOS=linux GOARCH=amd64 make
+	GOOS=linux GOARCH=amd64 make -B
 	$(TAR) $(TAR_FLAGS) -czvf _output/$(ARTIFACT_NAME)-linux-amd64.tar.gz $(CURDIR)/bin/*
-	GOOS=linux GOARCH=arm64 make
+	GOOS=linux GOARCH=arm64 make -B
 	$(TAR) $(TAR_FLAGS) -czvf _output/$(ARTIFACT_NAME)-linux-arm64.tar.gz $(CURDIR)/bin/*
-	GOOS=linux GOARCH=arm GOARM=7 make
+	GOOS=linux GOARCH=arm GOARM=7 make -B
 	$(TAR) $(TAR_FLAGS) -czvf _output/$(ARTIFACT_NAME)-linux-arm-v7.tar.gz $(CURDIR)/bin/*
-	GOOS=linux GOARCH=ppc64le make
+	GOOS=linux GOARCH=ppc64le make -B
 	$(TAR) $(TAR_FLAGS) -czvf _output/$(ARTIFACT_NAME)-linux-ppc64le.tar.gz $(CURDIR)/bin/*
-	GOOS=linux GOARCH=s390x make
+	GOOS=linux GOARCH=s390x make -B
 	$(TAR) $(TAR_FLAGS) -czvf _output/$(ARTIFACT_NAME)-linux-s390x.tar.gz $(CURDIR)/bin/*
+	GOOS=linux GOARCH=riscv64 make -B
+	$(TAR) $(TAR_FLAGS) -czvf _output/$(ARTIFACT_NAME)-linux-riscv64.tar.gz $(CURDIR)/bin/*
 
 .PHONY: \
 	$(TARGET_BIN) \

go.mod

@@ -1,11 +1,37 @@
 module github.com/containerd/fuse-overlayfs-snapshotter
 
-go 1.16
+go 1.19
 
 require (
-	github.com/containerd/containerd v1.6.6
-	github.com/containerd/continuity v0.2.2
-	github.com/coreos/go-systemd/v22 v22.3.2
-	github.com/sirupsen/logrus v1.8.1
-	google.golang.org/grpc v1.43.0
+	github.com/containerd/containerd v1.6.9
+	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
+)
+
+require (
+	github.com/Microsoft/go-winio v0.5.2 // indirect
+	github.com/Microsoft/hcsshim v0.9.4 // indirect
+	github.com/containerd/cgroups v1.0.3 // indirect
+	github.com/containerd/ttrpc v1.1.0 // 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/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // 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.0.0-20220722155237-a158d28d115b // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/text v0.3.7 // 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
 )