Skip to content

Commit c962647

Browse files
AkihiroSudaAlex Couture-Beil
authored andcommitted
bump up stargz-snapshotter
The git repo of github.com/containerd/stargz-snapshotter now has two go.mod modules: - github.com/containerd/stargz-snapshotter - github.com/containerd/stargz-snapshotter/estargz So we need to have the following `replace` directive in `go.mod`: ``` github.com/containerd/stargz-snapshotter/estargz => github.com/containerd/stargz-snapshotter/estargz <VERSION> ``` Otherwise `go mod tidy` fails with the following error: ``` go: github.com/containerd/[email protected] requires github.com/containerd/stargz-snapshotter/[email protected]: invalid version: unknown revision 000000000000 ``` ref: containerd/stargz-snapshotter#195 Signed-off-by: Akihiro Suda <[email protected]>
1 parent b9b1cc5 commit c962647

File tree

362 files changed

+27759
-6840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

362 files changed

+27759
-6840
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ ARG ROOTLESSKIT_VERSION=v0.11.1
1212
ARG CNI_VERSION=v0.8.7
1313
ARG SHADOW_VERSION=4.8.1
1414
ARG FUSEOVERLAYFS_VERSION=v1.3.0
15-
ARG STARGZ_SNAPSHOTTER_VERSION=v0.2.0
15+
# master (Dec 17, 2020)
16+
ARG STARGZ_SNAPSHOTTER_VERSION=2b97b583765b26f7284fe13f39f4ef925ecf87c3
1617

1718
ARG ALPINE_VERSION=3.12
1819

go.mod

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ require (
99
github.com/Microsoft/hcsshim v0.8.10
1010
github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58 // indirect
1111
github.com/containerd/console v1.0.1
12-
github.com/containerd/containerd v1.4.1-0.20201117152358-0edc412565dc
13-
github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe
12+
github.com/containerd/containerd v1.4.1-0.20201215193253-e922d5553d12
13+
github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7
1414
github.com/containerd/go-cni v1.0.1
1515
github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0
16-
github.com/containerd/stargz-snapshotter v0.2.0
16+
github.com/containerd/stargz-snapshotter v0.2.1-0.20201217071531-2b97b583765b
1717
github.com/containerd/typeurl v1.0.1
1818
github.com/coreos/go-systemd/v22 v22.1.0
1919
github.com/docker/cli v20.10.0-beta1.0.20201029214301-1d20b15adc38+incompatible
@@ -22,11 +22,11 @@ require (
2222
github.com/docker/go-connections v0.4.0
2323
github.com/docker/libnetwork v0.8.0-dev.2.0.20200917202933-d0951081b35f
2424
github.com/gofrs/flock v0.7.3
25-
github.com/gogo/googleapis v1.3.2
25+
github.com/gogo/googleapis v1.4.0
2626
github.com/gogo/protobuf v1.3.1
2727
// protobuf: the actual version is replaced in replace()
28-
github.com/golang/protobuf v1.4.2
29-
github.com/google/go-cmp v0.4.1
28+
github.com/golang/protobuf v1.4.3
29+
github.com/google/go-cmp v0.5.1
3030
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
3131
github.com/gorilla/mux v1.8.0 // indirect
3232
github.com/grpc-ecosystem/go-grpc-middleware v1.2.0
@@ -61,15 +61,17 @@ require (
6161
go.etcd.io/bbolt v1.3.5
6262
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9
6363
golang.org/x/net v0.0.0-20200707034311-ab3426394381
64-
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
65-
golang.org/x/sys v0.0.0-20201013081832-0aaa2718063a
64+
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
65+
golang.org/x/sys v0.0.0-20201202213521-69691e467435
6666
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1
6767
// genproto: the actual version is replaced in replace()
6868
google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece
69-
google.golang.org/grpc v1.29.1
69+
google.golang.org/grpc v1.30.0
7070
)
7171

7272
replace (
73+
// estargz: needs this replace because stargz-snapshotter git repo has two go.mod modules.
74+
github.com/containerd/stargz-snapshotter/estargz => github.com/containerd/stargz-snapshotter/estargz v0.0.0-20201217071531-2b97b583765b
7375
// protobuf: corresponds to containerd
7476
github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
7577
github.com/hashicorp/go-immutable-radix => github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe

go.sum

Lines changed: 102 additions & 16 deletions
Large diffs are not rendered by default.

vendor/github.com/Microsoft/go-winio/backuptar/noop.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/archive/strconv.go renamed to vendor/github.com/Microsoft/go-winio/backuptar/strconv.go

Lines changed: 25 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)