Merge pull request #27 from AkihiroSuda/dev

update dependencies

Author: AkihiroSuda

.github/workflows/main.yml

@@ -1,8 +1,19 @@
 name: CI
-on: [push, pull_request]
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - master
 jobs:
  test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        fuse-overlayfs: [v1.0.0, v1.4.0, master]
+    env:
+      FUSEOVERLAYFS_COMMIT: "${{ matrix.fuse-overlayfs }}"
     steps:
     - uses: actions/checkout@master
     - run: make test

Dockerfile

@@ -1,20 +1,23 @@
-ARG FUSEOVERLAYFS_COMMIT=v1.3.0
-ARG ROOTLESSKIT_COMMIT=v0.11.1
+ARG FUSEOVERLAYFS_COMMIT=master
+ARG ROOTLESSKIT_COMMIT=v0.14.0-beta.0
 ARG SHADOW_COMMIT=4.8.1
 
-FROM golang:1.15-alpine AS containerd-fuse-overlayfs-test
+ARG GO_VERSION=1.16
+ARG DEBIAN_VERSION=10
+ARG ALPINE_VERSION=3.13
+
+FROM golang:${GO_VERSION}-alpine AS containerd-fuse-overlayfs-test
 COPY . /go/src/github.com/AkihiroSuda/containerd-fuse-overlayfs
 WORKDIR  /go/src/github.com/AkihiroSuda/containerd-fuse-overlayfs
 ENV CGO_ENABLED=0
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 RUN mkdir /out && go test -c -o /out/containerd-fuse-overlayfs.test
 
 # from https://github.com/containers/fuse-overlayfs/blob/53c17dab78b43de1cd121bf9260b20b76371bbaf/Dockerfile.static.ubuntu
-FROM docker.io/debian:10 AS fuse-overlayfs
+FROM debian:${DEBIAN_VERSION} AS fuse-overlayfs
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \
         git ca-certificates libc6-dev gcc g++ make automake autoconf clang pkgconf libfuse3-dev
-ARG FUSEOVERLAYFS_REPO
 RUN git clone https://github.com/containers/fuse-overlayfs
 WORKDIR fuse-overlayfs
 ARG FUSEOVERLAYFS_COMMIT
@@ -23,7 +26,7 @@ RUN  ./autogen.sh && \
      LIBS="-ldl" LDFLAGS="-static" ./configure && \
      make && mkdir /out && cp fuse-overlayfs /out
 
-FROM golang:1.15-alpine AS rootlesskit
+FROM golang:${GO_VERSION}-alpine AS rootlesskit
 RUN apk add --no-cache git
 RUN git clone https://github.com/rootless-containers/rootlesskit.git /go/src/github.com/rootless-containers/rootlesskit
 WORKDIR /go/src/github.com/rootless-containers/rootlesskit
@@ -32,7 +35,7 @@ RUN git pull && git checkout ${ROOTLESSKIT_COMMIT}
 ENV CGO_ENABLED=0
 RUN mkdir /out && go build -o /out/rootlesskit github.com/rootless-containers/rootlesskit/cmd/rootlesskit 
 
-FROM alpine:3.12 AS idmap
+FROM alpine:${ALPINE_VERSION} AS idmap
 RUN apk add --no-cache autoconf automake build-base byacc gettext gettext-dev gcc git libcap-dev libtool libxslt
 RUN git clone https://github.com/shadow-maint/shadow.git
 WORKDIR shadow
@@ -41,7 +44,7 @@ RUN git pull && git checkout ${SHADOW_COMMIT}
 RUN ./autogen.sh --disable-nls --disable-man --without-audit --without-selinux --without-acl --without-attr --without-tcb --without-nscd && \
    make && mkdir -p /out && cp src/newuidmap src/newgidmap /out
 
-FROM alpine:3.12
+FROM alpine:${ALPINE_VERSION}
 COPY --from=containerd-fuse-overlayfs-test /out/containerd-fuse-overlayfs.test /usr/local/bin
 COPY --from=rootlesskit /out/rootlesskit /usr/local/bin
 COPY --from=fuse-overlayfs /out/fuse-overlayfs /usr/local/bin

Makefile

@@ -13,7 +13,8 @@ clean:
 	rm -rf bin
 
 test:
-	DOCKER_BUILDKIT=1 docker build -t containerd-fuse-overlayfs-test .
+	DOCKER_BUILDKIT=1 docker build -t containerd-fuse-overlayfs-test --build-arg FUSEOVERLAYFS_COMMIT=${FUSEOVERLAYFS_COMMIT} .
+	docker run --rm containerd-fuse-overlayfs-test fuse-overlayfs -V
 	docker run --rm --security-opt seccomp=unconfined --security-opt apparmor=unconfined --device /dev/fuse containerd-fuse-overlayfs-test
 	docker rmi containerd-fuse-overlayfs-test
 

go.mod

@@ -1,21 +1,14 @@
 module github.com/AkihiroSuda/containerd-fuse-overlayfs
 
-go 1.13
+go 1.16
 
 require (
-	github.com/Microsoft/hcsshim v0.8.9 // indirect
-	github.com/containerd/containerd v1.4.0
-	github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe
-	github.com/containerd/ttrpc v1.0.1 // indirect
-	github.com/containerd/typeurl v1.0.1 // indirect
+	github.com/containerd/containerd v1.5.0-beta.2
+	github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7
 	github.com/coreos/go-systemd/v22 v22.1.0
-	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
-	github.com/golang/protobuf v1.3.5 // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/sirupsen/logrus v1.6.0 // indirect
-	go.etcd.io/bbolt v1.3.5 // indirect
-	google.golang.org/grpc v1.27.1
-	gotest.tools/v3 v3.0.2 // indirect
+	google.golang.org/grpc v1.30.0
 )
+
+// replace grpc to match https://github.com/containerd/containerd/blob/master/go.mod
+replace google.golang.org/grpc => google.golang.org/grpc v1.27.1