diff --git a/.cirrus.yml b/.cirrus.yml index 102750fc6ac..c70f94cf15b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -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: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b7ccdd2b115..ee173bf366a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: @@ -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 diff --git a/Dockerfile b/Dockerfile index cf1977a496c..f4deb1aca86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -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 diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.2 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.2 deleted file mode 100644 index 838746aebb0..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.2 +++ /dev/null @@ -1,2 +0,0 @@ -6d0fe3f1ec2dce4ed2a5c9baf05fb279225b3b0e3bbee4092304fe284ca7fc47 buildkit-v0.11.2.linux-amd64.tar.gz -8a8c2274852ea4bac6ccf1862a46679e93c013de8c5c0434a3040bab2e0a42a7 buildkit-v0.11.2.linux-arm64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.3 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.3 new file mode 100644 index 00000000000..87f11f45be6 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.3 @@ -0,0 +1,2 @@ +f631978dc283670500a602df1ba1a49333af137c0792716c5510d3cbb9cb4ede buildkit-v0.11.3.linux-amd64.tar.gz +3425ebba8ff0748e2a26dc9f45a879a03bde0937c6acbbc8e6659b905d014f07 buildkit-v0.11.3.linux-arm64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/kubo-v0.18.0 b/Dockerfile.d/SHA256SUMS.d/kubo-v0.18.0 deleted file mode 100644 index 8a53dd3b6ec..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/kubo-v0.18.0 +++ /dev/null @@ -1,3 +0,0 @@ -# From https://github.com/ipfs/kubo/releases -feda3df53d1f9a80afb71518714894d54269fdd2f27eae675a048aa1e7c5b956 kubo_v0.18.0_linux-amd64.tar.gz -416974e3e12d019b72adbe2cc3f13398f281bdd53250d670497c606b423e68fc kubo_v0.18.0_linux-arm64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/kubo-v0.18.1 b/Dockerfile.d/SHA256SUMS.d/kubo-v0.18.1 new file mode 100644 index 00000000000..22d2e4ea74c --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/kubo-v0.18.1 @@ -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