diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6a491d555e4..b9a1f3c4f83 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,10 +31,10 @@ jobs: containerd: v1.7.23 arch: amd64 - runner: ubuntu-24.04 - containerd: v2.0.0-rc.5 + containerd: v2.0.0 arch: amd64 - runner: arm64-8core-32gb - containerd: v2.0.0-rc.5 + containerd: v2.0.0 arch: arm64 env: CONTAINERD_VERSION: "${{ matrix.containerd }}" @@ -114,11 +114,11 @@ jobs: runner: "ubuntu-22.04" arch: amd64 - ubuntu: 24.04 - containerd: v2.0.0-rc.5 + containerd: v2.0.0 runner: "ubuntu-24.04" arch: amd64 - ubuntu: 24.04 - containerd: v2.0.0-rc.5 + containerd: v2.0.0 runner: arm64-8core-32gb arch: arm64 env: @@ -168,7 +168,7 @@ jobs: matrix: include: - ubuntu: 24.04 - containerd: v2.0.0-rc.5 + containerd: v2.0.0 arch: amd64 env: CONTAINERD_VERSION: "${{ matrix.containerd }}" @@ -240,7 +240,7 @@ jobs: target: rootless arch: amd64 - ubuntu: 24.04 - containerd: v2.0.0-rc.5 + containerd: v2.0.0 rootlesskit: v2.3.1 target: rootless arch: amd64 diff --git a/Dockerfile b/Dockerfile index 71ec06a0ea3..4892f0b911e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,12 +18,12 @@ # TODO: verify commit hash # Basic deps -ARG CONTAINERD_VERSION=v2.0.0-rc.6 -ARG RUNC_VERSION=v1.2.0 +ARG CONTAINERD_VERSION=v2.0.0 +ARG RUNC_VERSION=v1.2.1 ARG CNI_PLUGINS_VERSION=v1.6.0 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.16.0 +ARG BUILDKIT_VERSION=v0.17.0 # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1 # Extra deps: Encryption @@ -35,7 +35,7 @@ ARG SLIRP4NETNS_VERSION=v1.3.1 ARG BYPASS4NETNS_VERSION=v0.4.1 # Extra deps: FUSE-OverlayFS ARG FUSE_OVERLAYFS_VERSION=v1.14 -ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.8 +ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.0.0 # Extra deps: Init ARG TINI_VERSION=v0.19.0 # Extra deps: Debug @@ -47,7 +47,7 @@ ARG UBUNTU_VERSION=24.04 ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1 ARG GOTESTSUM_VERSION=v1.12.0 ARG NYDUS_VERSION=v2.3.0 -ARG SOCI_SNAPSHOTTER_VERSION=0.7.0 +ARG SOCI_SNAPSHOTTER_VERSION=0.8.0 ARG KUBO_VERSION=v0.31.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.5.0 AS xx diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.16.0 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.16.0 deleted file mode 100644 index d150cc6c876..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.16.0 +++ /dev/null @@ -1,2 +0,0 @@ -a07a01da821d39bdb6e03a2f98ee407bb861cc61ece2e69e2ea4d61b3a4ab7f1 buildkit-v0.16.0.linux-amd64.tar.gz -1b70bb7955ddda66537d4bf9aa540e79e79e19aa989901613da58f5f133a53ef buildkit-v0.16.0.linux-arm64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.17.0 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.17.0 new file mode 100644 index 00000000000..7209867ca99 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.17.0 @@ -0,0 +1,2 @@ +3a9fea5977df76e9008fa5fb3d9b5dd581729e8adced2180a45bd3c12a4d1331 buildkit-v0.17.0.linux-amd64.tar.gz +5ec19fe78eeef2c03bef216d6890f05901fc117e7a66f88b423268dfcf5cf4af buildkit-v0.17.0.linux-arm64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.8 b/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.8 deleted file mode 100644 index 1a5d72b95dc..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.8 +++ /dev/null @@ -1,6 +0,0 @@ -a831f236299007bd1078e49df2e45ad0aeee47c5ed099852ad5f6791b091d536 containerd-fuse-overlayfs-1.0.8-linux-amd64.tar.gz -d0fd1fd92ee9ef03050aa759f197b50c46bca81a75bed65b4433b6213a145022 containerd-fuse-overlayfs-1.0.8-linux-arm-v7.tar.gz -17a3a83ae92002dce8ebe41e6a10877ac5d417550d63939c74fc22b0be6ca04a containerd-fuse-overlayfs-1.0.8-linux-arm64.tar.gz -dddaea552594166eb4edef8adabe765b2fae099574b7afe47657fc87674c81db containerd-fuse-overlayfs-1.0.8-linux-ppc64le.tar.gz -d6846b4bf1500cc2dbd29e382ba8b1f2268bdbfc5358a48d17131b8108f97aa9 containerd-fuse-overlayfs-1.0.8-linux-riscv64.tar.gz -492ce81ed25a9b8b3c64d807d3e0f7de6011e70dc11915df8aef64a77fa67fb9 containerd-fuse-overlayfs-1.0.8-linux-s390x.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v2.0.0 b/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v2.0.0 new file mode 100644 index 00000000000..b6912d6b20b --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v2.0.0 @@ -0,0 +1,6 @@ +dc20341234be8fa44e1308c9f38e30d7239c12350a046c83f4d1c804b682fe6c containerd-fuse-overlayfs-2.0.0-linux-amd64.tar.gz +acfaa3a2caa6316b2c409bcb1c2600b6faee504188c412df8261024435dbfefc containerd-fuse-overlayfs-2.0.0-linux-arm-v7.tar.gz +8b8032a4e0d16aedf7797818944147cebefad32e6657e0b7089501bcfc732e57 containerd-fuse-overlayfs-2.0.0-linux-arm64.tar.gz +b4603139b2a532ac9ed8df3197669d3df5dfd9bebda2aa5f507ad6e6dbb1ed77 containerd-fuse-overlayfs-2.0.0-linux-ppc64le.tar.gz +9e169b401e063cfb0b7b192f911dcb2532ec86a64844d8c052e076fe692017c3 containerd-fuse-overlayfs-2.0.0-linux-riscv64.tar.gz +e8dfe8e2aff5b32f2f5698909baadd0cb36aa85704ff8c568f6bcae186e0ccc5 containerd-fuse-overlayfs-2.0.0-linux-s390x.tar.gz