Skip to content

Commit

Permalink
update containerd (v1.5.6), stargz-snapshotter (v0.9.0), and other go…
Browse files Browse the repository at this point in the history
… modules

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
  • Loading branch information
AkihiroSuda committed Sep 30, 2021
1 parent 180053d commit df405ee
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 51 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Usage: `docker run -it --privileged <IMAGE>`. Make sure to add `-t` and `--privileged`.

# Basic deps
ARG CONTAINERD_VERSION=1.5.5
ARG CONTAINERD_VERSION=1.5.6
ARG RUNC_VERSION=1.0.2
ARG CNI_PLUGINS_VERSION=1.0.1

Expand All @@ -25,7 +25,7 @@ ARG CNI_ISOLATION_VERSION=0.0.4
# Extra deps: Build
ARG BUILDKIT_VERSION=0.9.0
# Extra deps: Lazy-pulling
ARG STARGZ_SNAPSHOTTER_VERSION=0.8.0
ARG STARGZ_SNAPSHOTTER_VERSION=0.9.0
# Extra deps: Encryption
ARG IMGCRYPT_VERSION=1.1.1
# Extra deps: Rootless
Expand Down
4 changes: 0 additions & 4 deletions Dockerfile.d/SHA256SUMS.d/containerd-1.5.5

This file was deleted.

4 changes: 4 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/containerd-1.5.6
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# From https://github.com/kind-ci/containerd-nightlies/releases/tag/containerd-1.5.6
5c4107a28e86b712ab0903d6af08b4d9cffde1705c2db0847baa3a81bac22fdd containerd-1.5.6.linux-amd64.tar.gz
2ac4f5533a8a78cb7844f6787909b80e9c4de932fd025622e0c2f1cabc1b9e80 containerd-1.5.6.linux-arm64.tar.gz
16a9e9fed866ad36246239582a1d72eb2f815b6b10298a8ae493dca72af71b31 containerd.service
3 changes: 0 additions & 3 deletions Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-0.8.0

This file was deleted.

3 changes: 3 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-0.9.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
0efbbc32eb5a2350fb1535f5e30727d1b0ce792b866dd261f39d2d91b2f9b692 stargz-snapshotter-v0.9.0-linux-amd64.tar.gz
23f3ef3d2a72fa4d319c5da0cd104c9057c7f58306fc59c48fac23252ed3781c stargz-snapshotter-v0.9.0-linux-arm64.tar.gz
f1cf855870af16a653d8acb9daa3edf84687c2c05323cb958f078fb148af3eec stargz-snapshotter.service
20 changes: 10 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ go 1.16

require (
github.com/Microsoft/go-winio v0.5.0
github.com/compose-spec/compose-go v0.0.0-20210827054550-c78dcffd54c5
github.com/compose-spec/compose-go v1.0.1
github.com/containerd/cgroups v1.0.1
github.com/containerd/console v1.0.3
github.com/containerd/containerd v1.5.5 // replaced, see the bottom of this file
github.com/containerd/containerd v1.5.6 // replaced, see the bottom of this file
github.com/containerd/containerd/api v0.0.0 // replaced, see the bottom of this file
github.com/containerd/continuity v0.2.0
github.com/containerd/go-cni v1.1.0
github.com/containerd/imgcrypt v1.1.1
github.com/containerd/stargz-snapshotter v0.8.0
github.com/containerd/stargz-snapshotter/estargz v0.8.0
github.com/containerd/stargz-snapshotter v0.9.0
github.com/containerd/stargz-snapshotter/estargz v0.9.0
github.com/containerd/typeurl v1.0.2
github.com/containernetworking/cni v1.0.1
github.com/containernetworking/plugins v1.0.1
Expand All @@ -29,20 +29,20 @@ require (
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.0.2-0.20210819154149-5ad6f50d6283
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
github.com/opencontainers/runtime-spec v1.0.3-0.20210910115017-0d6cc581aeea
github.com/pkg/errors v0.9.1
github.com/rootless-containers/rootlesskit v0.14.5
github.com/sirupsen/logrus v1.8.1
github.com/tidwall/gjson v1.9.1
github.com/urfave/cli/v2 v2.3.0
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
gotest.tools/v3 v3.0.3
)

replace (
github.com/containerd/containerd => github.com/containerd/containerd v1.5.1-0.20210921144419-90c6ff97a88f
github.com/containerd/containerd/api => github.com/containerd/containerd/api v0.0.0-20210921144419-90c6ff97a88f
github.com/containerd/containerd => github.com/containerd/containerd v1.5.1-0.20210929204031-a06a0990eca3
github.com/containerd/containerd/api => github.com/containerd/containerd/api v0.0.0-20210929204031-a06a0990eca3
)

0 comments on commit df405ee

Please sign in to comment.