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.

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 (1.6.19), BuildKit (0.11.3), Kubo (0.18.1) #2047

Merged
merged 4 commits into from
Feb 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ windows_task:
matrix:
- name: "Windows/containerd-1.6"
env:
ctrdVersion: 1.6.16
ctrdVersion: 1.6.19
env:
CGO_ENABLED: 0
build_script:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ jobs:
# ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
include:
- ubuntu: 20.04
containerd: v1.5.17
containerd: v1.5.18
- ubuntu: 20.04
containerd: v1.6.16
containerd: v1.6.19
- ubuntu: 22.04
containerd: v1.6.16
containerd: v1.6.19
- ubuntu: 22.04
containerd: main
env:
Expand Down Expand Up @@ -112,25 +112,25 @@ jobs:
# ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2
include:
- ubuntu: 20.04
containerd: v1.5.17
containerd: v1.5.18
target: test-integration-rootless
- ubuntu: 20.04
containerd: v1.6.16
containerd: v1.6.19
target: test-integration-rootless
- ubuntu: 22.04
containerd: v1.6.16
containerd: v1.6.19
target: test-integration-rootless
- ubuntu: 22.04
containerd: main
target: test-integration-rootless
- ubuntu: 20.04
containerd: v1.5.17
containerd: v1.5.18
target: test-integration-rootless-port-slirp4netns
- ubuntu: 20.04
containerd: v1.6.16
containerd: v1.6.19
target: test-integration-rootless-port-slirp4netns
- ubuntu: 22.04
containerd: v1.6.16
containerd: v1.6.19
target: test-integration-rootless-port-slirp4netns
- ubuntu: 22.04
containerd: main
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
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.16
ARG CONTAINERD_VERSION=v1.6.19
ARG RUNC_VERSION=v1.1.4
ARG CNI_PLUGINS_VERSION=v1.2.0

# Extra deps: Build
ARG BUILDKIT_VERSION=v0.11.2
ARG BUILDKIT_VERSION=v0.11.3
# Extra deps: Lazy-pulling
ARG STARGZ_SNAPSHOTTER_VERSION=v0.14.1
# Extra deps: Nydus Lazy-pulling
ARG NYDUS_VERSION=v2.1.3
ARG NYDUS_VERSION=v2.1.4
# Extra deps: Encryption
ARG IMGCRYPT_VERSION=v1.1.7
# Extra deps: Rootless
Expand All @@ -39,7 +39,7 @@ ARG BYPASS4NETNS_VERSION=v0.3.0
ARG FUSE_OVERLAYFS_VERSION=v1.10
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.5
# Extra deps: IPFS
ARG KUBO_VERSION=v0.18.0
ARG KUBO_VERSION=v0.18.1
# Extra deps: Init
ARG TINI_VERSION=v0.19.0
# Extra deps: Debug
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.2

This file was deleted.

2 changes: 2 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.3
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
f631978dc283670500a602df1ba1a49333af137c0792716c5510d3cbb9cb4ede buildkit-v0.11.3.linux-amd64.tar.gz
3425ebba8ff0748e2a26dc9f45a879a03bde0937c6acbbc8e6659b905d014f07 buildkit-v0.11.3.linux-arm64.tar.gz
3 changes: 0 additions & 3 deletions Dockerfile.d/SHA256SUMS.d/kubo-v0.18.0

This file was deleted.

3 changes: 3 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/kubo-v0.18.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# From https://github.com/ipfs/kubo/releases
15d42b47b8529edda3e8e2d6fe6c14958d939c4efd07dea02e204743e05216f3 kubo_v0.18.1_linux-amd64.tar.gz
9c2e0d7ad3341a0769db421197d37cba38ef2fec67fac39e05d4052cf0feb3cd kubo_v0.18.1_linux-arm64.tar.gz