Merge pull request #283 from bergwolf/upstream/deps

fix some contrib projects depbot warnings
dragonflyoss · Jan 19, 2022 · f16506d · f16506d
2 parents a7c2ff6 + 9caf054
commit f16506d
Show file tree

Hide file tree

Showing 7 changed files with 608 additions and 109 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,12 +12,20 @@ env:
 jobs:
   contrib-ut:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go-version: [1.16.x, 1.17.x]
+    env:
+      DOCKER: false
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
       - name: cache go mod
         uses: actions/cache@v2
         with:
-          path: ~/go/pkg/mod
+          path: /go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/contrib/nydus-snapshotter/go.sum', '**/contrib/nydusify/go.sum', '**/contrib/ctr-remote/go.sum', '**/contrib/docker-nydus-graphdriver/go.sum', '**/contrib/nydus-overlayfs/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,12 +45,18 @@ jobs:
           configs
   build-contrib:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go-version: [1.17.x]
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ${{ matrix.go-version }}
     - name: cache go mod
       uses: actions/cache@v2
       with:
-        path: ~/go/pkg/mod
+        path: /go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/contrib/nydus-snapshotter/go.sum', '**/contrib/nydusify/go.sum', '**/contrib/ctr-remote/go.sum', '**/contrib/docker-nydus-graphdriver/go.sum', '**/contrib/nydus-overlayfs/go.sum') }}
         restore-keys: |
           ${{ runner.os }}-go

diff --git a/contrib/ctr-remote/commands/rpull.go b/contrib/ctr-remote/commands/rpull.go
@@ -71,10 +71,7 @@ After pulling an image, it should be ready to use the same reference in a run co
 		}
 		config.FetchConfig = fc
 
-		if err := pull(ctx, client, ref, config); err != nil {
-			return err
-		}
-		return nil
+		return pull(ctx, client, ref, config)
 	},
 }
 

diff --git a/contrib/ctr-remote/go.mod b/contrib/ctr-remote/go.mod
@@ -3,8 +3,10 @@ module github.com/dragonflyoss/image-service/contrib/ctr-remote
 go 1.16
 
 require (
-	github.com/containerd/containerd v1.5.9
+	github.com/containerd/containerd v1.6.0-beta.4
 	github.com/dragonflyoss/image-service/contrib/nydus-snapshotter v0.0.0-20210812024946-ec518a7d1cb8
-	github.com/opencontainers/image-spec v1.0.2
+	github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5
 	github.com/urfave/cli v1.22.5
 )
+
+replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.3
diff --git a/contrib/ctr-remote/go.sum b/contrib/ctr-remote/go.sum
diff --git a/contrib/docker-nydus-graphdriver/go.mod b/contrib/docker-nydus-graphdriver/go.mod
@@ -3,18 +3,21 @@ module github.com/dragonflyoss/image-service/contrib/nydus_graphdriver
 go 1.15
 
 require (
-	github.com/containerd/containerd v1.5.4 // indirect
+	github.com/containerd/containerd v1.6.0-beta.4 // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
-	github.com/docker/docker v20.10.7+incompatible
-	github.com/docker/go-connections v0.4.0 // indirect
-	github.com/docker/go-plugins-helpers v0.0.0-20200102110956-c9a8a2d92ccc
-	github.com/moby/sys/mount v0.2.0 // indirect
-	github.com/moby/sys/mountinfo v0.4.1
-	github.com/opencontainers/selinux v1.8.0
+	github.com/docker/docker v20.10.3-0.20211206061157-934f955e3d62+incompatible
+	github.com/docker/go-plugins-helpers v0.0.0-20211224144127-6eecb7beb651
+	github.com/moby/sys/mount v0.3.0 // indirect
+	github.com/moby/sys/mountinfo v0.5.0
+	github.com/opencontainers/selinux v1.8.2
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1
 	github.com/vbatts/tar-split v0.11.1 // indirect
-	golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
-	golang.org/x/sys v0.0.0-20210608053332-aa57babbf139
-	google.golang.org/grpc v1.38.0 // indirect
+	golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359
+)
+
+replace (
+	github.com/containerd/go-runc => github.com/containerd/go-runc v1.0.0
+	github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2
+	github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.3
 )