Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update containerd, CNI plugins, IPFS, Stargz Snapshotter #856

Merged
merged 1 commit into from
Mar 3, 2022
Merged

update containerd, CNI plugins, IPFS, Stargz Snapshotter #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ windows_task:
matrix:
- name: "Windows/containerd-1.6"
env:
ctrdVersion: 1.6.0
ctrdVersion: 1.6.1
env:
CGO_ENABLED: 0
build_script:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
containerd: [v1.4.5, v1.6.0, main]
containerd: [v1.4.5, v1.6.1, main]
env:
CONTAINERD_VERSION: "${{ matrix.containerd }}"
steps:
Expand All @@ -83,7 +83,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
containerd: [v1.4.5, v1.6.0, main]
containerd: [v1.4.5, v1.6.1, main]
env:
CONTAINERD_VERSION: "${{ matrix.containerd }}"
steps:
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
# TODO: verify commit hash

# Basic deps
ARG CONTAINERD_VERSION=v1.6.0
ARG CONTAINERD_VERSION=v1.6.1
ARG RUNC_VERSION=v1.1.0
ARG CNI_PLUGINS_VERSION=v1.0.1
ARG CNI_PLUGINS_VERSION=v1.1.0

# Extra deps: CNI isolation
ARG CNI_ISOLATION_VERSION=v0.0.4
# Extra deps: Build
ARG BUILDKIT_VERSION=v0.9.3
# Extra deps: Lazy-pulling
ARG STARGZ_SNAPSHOTTER_VERSION=v0.11.0
ARG STARGZ_SNAPSHOTTER_VERSION=v0.11.1
# Extra deps: Encryption
ARG IMGCRYPT_VERSION=v1.1.3
# Extra deps: Rootless
Expand All @@ -39,7 +39,7 @@ ARG BYPASS4NETNS_VERSION=v0.2.2
ARG FUSE_OVERLAYFS_VERSION=v1.8.2
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.4
# Extra deps: IPFS
ARG IPFS_VERSION=v0.11.0
ARG IPFS_VERSION=v0.12.0

# Test deps
ARG GO_VERSION=1.17
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.0.1
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.1.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
05d46ac19d01669d424ee57401c0deba101763ac494858064b4ea4ffdcc37c5d cni-plugins-linux-amd64-v1.1.0.tgz
33fc7b8d9d5be2d7f95e69e6a9e2af206879942f1e6b7615c04017dce5067f1a cni-plugins-linux-arm64-v1.1.0.tgz
3 changes: 0 additions & 3 deletions Dockerfile.d/SHA256SUMS.d/go-ipfs-v0.11.0
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/go-ipfs-v0.12.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# From https://github.com/ipfs/go-ipfs/releases
1878db47007e2f3c595c775d5728c5bd78038092641be9becf4d622076a012dc go-ipfs_v0.12.0_linux-amd64.tar.gz
af0f7b87ec38598ccf2bd0aa310092f3956457d53a89a04fa4b5eef205c69794 go-ipfs_v0.12.0_linux-arm64.tar.gz
3 changes: 0 additions & 3 deletions Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-v0.11.0
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-v0.11.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
f958a77b9cc639620af78208b34213fbd17fe28699708a7d3a9c7862025a7a4c stargz-snapshotter-v0.11.1-linux-amd64.tar.gz
37559fc5b62757ae148efed1070c319ad0323aae91a1d83edce1e157644e29ea stargz-snapshotter-v0.11.1-linux-arm64.tar.gz
f1cf855870af16a653d8acb9daa3edf84687c2c05323cb958f078fb148af3eec stargz-snapshotter.service
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/containerd/stargz-snapshotter/ipfs v0.11.0
github.com/containerd/typeurl v1.0.2
github.com/containernetworking/cni v1.0.1
github.com/containernetworking/plugins v1.0.1
github.com/containernetworking/plugins v1.1.0
github.com/cyphar/filepath-securejoin v0.2.3
github.com/docker/cli v20.10.12+incompatible
github.com/docker/docker v20.10.12+incompatible
Expand All @@ -37,7 +37,7 @@ require (
github.com/opencontainers/image-spec v1.0.3-0.20211215212317-ea0209f50ae1
github.com/opencontainers/runtime-spec v1.0.3-0.20211214071223-8958f93039ab
github.com/pelletier/go-toml v1.9.4
github.com/rootless-containers/bypass4netns v0.1.1-0.20220214050838-562b4845f47e
github.com/rootless-containers/bypass4netns v0.2.2
github.com/rootless-containers/rootlesskit v0.14.6
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.3.0
Expand Down
8 changes: 5 additions & 3 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,9 @@ github.com/containernetworking/cni v1.0.1 h1:9OIL/sZmMYDBe+G8svzILAlulUpaDTUjeAb
github.com/containernetworking/cni v1.0.1/go.mod h1:AKuhXbN5EzmD4yTNtfSsX3tPcmtrBI6QcRV0NiNt15Y=
github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM=
github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8=
github.com/containernetworking/plugins v1.0.1 h1:wwCfYbTCj5FC0EJgyzyjTXmqysOiJE9r712Z+2KVZAk=
github.com/containernetworking/plugins v1.0.1/go.mod h1:QHCfGpaTwYTbbH+nZXKVTxNBDZcxSOplJT5ico8/FLE=
github.com/containernetworking/plugins v1.1.0 h1:kTIldaDo9SlbQsjhUKvDx0v9q7zyIFJH/Rm9F4xRBro=
github.com/containernetworking/plugins v1.1.0/go.mod h1:Sr5TH/eBsGLXK/h71HeLfX19sZPp3ry5uHSkI4LPxV8=
github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc=
github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4=
github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY=
Expand Down Expand Up @@ -1489,6 +1490,7 @@ github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJ
github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
github.com/networkplumbing/go-nft v0.2.0/go.mod h1:HnnM+tYvlGAsMU7yoYwXEVLLiDW9gdMmb5HoGcwpuQs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nishanths/exhaustive v0.2.3/go.mod h1:bhIX678Nx8inLM9PbpvK1yv6oGtoP8BfaIeMzgBNKvc=
github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62PewwiQTlm/7Rj+cxVYqZvDIUc+JjZq6GHAC1fsObQ=
Expand Down Expand Up @@ -1658,8 +1660,8 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/rootless-containers/bypass4netns v0.1.1-0.20220214050838-562b4845f47e h1:z3xZoOlU1OvHXwktDJiK69nxhniKV7lyO3+agoipzTY=
github.com/rootless-containers/bypass4netns v0.1.1-0.20220214050838-562b4845f47e/go.mod h1:YOVRdnzEO3JHcxvobbHdUowG+98z0SIgBFQ6KqAQo9U=
github.com/rootless-containers/bypass4netns v0.2.2 h1:Mq0+PU1Eocyuf1kRxNH7cK7E/4hyo8tMfvVNIvyoJj8=
github.com/rootless-containers/bypass4netns v0.2.2/go.mod h1:YOVRdnzEO3JHcxvobbHdUowG+98z0SIgBFQ6KqAQo9U=
github.com/rootless-containers/rootlesskit v0.14.6 h1:5kvJK6eeUtWZz1mYegu5S7DHOahq93K+jbc/mz+hbFQ=
github.com/rootless-containers/rootlesskit v0.14.6/go.mod h1:uHPTRoPO6ZdOl2q99ZKOK14PJAwepfNKh6hV57AOZYQ=
github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
Expand Down