diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e13366fcaa4..8f634ee93d3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,10 +31,10 @@ jobs: containerd: v1.7.25 arch: amd64 - runner: ubuntu-24.04 - containerd: v2.0.1 + containerd: v2.0.2 arch: amd64 - runner: arm64-8core-32gb - containerd: v2.0.1 + containerd: v2.0.2 arch: arm64 env: CONTAINERD_VERSION: "${{ matrix.containerd }}" @@ -113,11 +113,11 @@ jobs: runner: "ubuntu-22.04" arch: amd64 - ubuntu: 24.04 - containerd: v2.0.1 + containerd: v2.0.2 runner: "ubuntu-24.04" arch: amd64 - ubuntu: 24.04 - containerd: v2.0.1 + containerd: v2.0.2 runner: arm64-8core-32gb arch: arm64 env: @@ -167,7 +167,7 @@ jobs: matrix: include: - ubuntu: 24.04 - containerd: v2.0.1 + containerd: v2.0.2 arch: amd64 env: CONTAINERD_VERSION: "${{ matrix.containerd }}" @@ -235,17 +235,17 @@ jobs: arch: amd64 - ubuntu: 22.04 containerd: v1.7.25 - rootlesskit: v2.3.1 + rootlesskit: v2.3.2 target: rootless arch: amd64 - ubuntu: 24.04 - containerd: v2.0.1 - rootlesskit: v2.3.1 + containerd: v2.0.2 + rootlesskit: v2.3.2 target: rootless arch: amd64 - ubuntu: 24.04 containerd: v1.7.25 - rootlesskit: v2.3.1 + rootlesskit: v2.3.2 target: rootless-port-slirp4netns arch: amd64 env: @@ -403,7 +403,7 @@ jobs: key: vagrant-${{ matrix.box }} - name: Set up vagrant run: | - # from https://github.com/containerd/containerd/blob/v2.0.1/.github/workflows/ci.yml#L583-L596 + # from https://github.com/containerd/containerd/blob/v2.0.2/.github/workflows/ci.yml#L583-L596 # which is based on https://github.com/opencontainers/runc/blob/v1.1.8/.cirrus.yml#L41-L49 curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list diff --git a/Dockerfile b/Dockerfile index c2afffcecc1..5023b3f21bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,24 +18,24 @@ # TODO: verify commit hash # Basic deps -ARG CONTAINERD_VERSION=v2.0.1 +ARG CONTAINERD_VERSION=v2.0.2 ARG RUNC_VERSION=v1.2.4 ARG CNI_PLUGINS_VERSION=v1.6.2 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.18.2 +ARG BUILDKIT_VERSION=v0.19.0 # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.16.3 # Extra deps: Encryption ARG IMGCRYPT_VERSION=v2.0.0 # Extra deps: Rootless -ARG ROOTLESSKIT_VERSION=v2.3.1 +ARG ROOTLESSKIT_VERSION=v2.3.2 ARG SLIRP4NETNS_VERSION=v1.3.1 # Extra deps: bypass4netns -ARG BYPASS4NETNS_VERSION=v0.4.1 +ARG BYPASS4NETNS_VERSION=v0.4.2 # Extra deps: FUSE-OverlayFS ARG FUSE_OVERLAYFS_VERSION=v1.14 -ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.1.0 +ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.1.1 # Extra deps: Init ARG TINI_VERSION=v0.19.0 # Extra deps: Debug diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.18.2 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.18.2 deleted file mode 100644 index 5a2660e6c67..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.18.2 +++ /dev/null @@ -1,2 +0,0 @@ -5662f23cfa5e475ff50932dd2b71d2c5812928fad631d1e8c9f8f5592a4c1568 buildkit-v0.18.2.linux-amd64.tar.gz -de0ae01abc689102de6a765f8f40a30e86203897d3a7b44511a3aa66824bbc48 buildkit-v0.18.2.linux-arm64.tar.gz \ No newline at end of file diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.19.0 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.19.0 new file mode 100644 index 00000000000..440c6b431ea --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.19.0 @@ -0,0 +1,2 @@ +9993fdd8b454e541ac14a1adf4bf53d271dbc8f3aafde45894bf689604a0a5cf buildkit-v0.19.0.linux-amd64.tar.gz +be7f7922d8f5eea02704cd707fb62b5a18e272452243804601b523ae6bef0ef5 buildkit-v0.19.0.linux-arm64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v2.1.0 b/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v2.1.0 deleted file mode 100644 index 60d31bb1113..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v2.1.0 +++ /dev/null @@ -1,6 +0,0 @@ -d8629e40e64f16b3b00ee17e393d48e495468d4397437a0a2982e86aaf3e7680 containerd-fuse-overlayfs-2.1.0-linux-amd64.tar.gz -9edbab1e93b2f87efb9532d84e20c67f58af3743adc3626b95fa74272bb0ebc7 containerd-fuse-overlayfs-2.1.0-linux-arm-v7.tar.gz -79d7e94350a4871320e3bca76a6a02860e70872d1ae4a4b8ecc2c655f0e62cb0 containerd-fuse-overlayfs-2.1.0-linux-arm64.tar.gz -fdec57ed7b3effbcb7aa34c6c65604ee94691c791fb6dec29a5055815dfc8816 containerd-fuse-overlayfs-2.1.0-linux-ppc64le.tar.gz -fe7ad1b516ccc87ab53f97de76008aff49d1523ea64c67f2f9da070d5fb3e0c1 containerd-fuse-overlayfs-2.1.0-linux-riscv64.tar.gz -c19b2d544ac4cd304df58baa7e68a1a1a3f93a80299c830f742379f21dd354c8 containerd-fuse-overlayfs-2.1.0-linux-s390x.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v2.1.1 b/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v2.1.1 new file mode 100644 index 00000000000..6596447644d --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v2.1.1 @@ -0,0 +1,6 @@ +2061a4064d163544f69e36fe56d008ab90f791906d5a96bddf87d3151fdde836 containerd-fuse-overlayfs-2.1.1-linux-amd64.tar.gz +99d08b0f41ede108f36efb9b5d8e0613be69336785cf97a73074487b52d9e71e containerd-fuse-overlayfs-2.1.1-linux-arm-v7.tar.gz +2219bf91d943480ce7021d6fce956379050757a500d36540b4372d45616c74eb containerd-fuse-overlayfs-2.1.1-linux-arm64.tar.gz +a2515f00553334b23470d52b088e49c3aa69aa9d66163dc14f188684bc8c774d containerd-fuse-overlayfs-2.1.1-linux-ppc64le.tar.gz +ae0fc07af2d34fb4c599364f82570ec43fed07f1892e493726f5414ecf8c8908 containerd-fuse-overlayfs-2.1.1-linux-riscv64.tar.gz +1200244a100b2433cc98a7ec8a0138073e9ad1c5e11ed503f5d2b3063dd40197 containerd-fuse-overlayfs-2.1.1-linux-s390x.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.1 b/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.1 deleted file mode 100644 index b624de1f641..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.1 +++ /dev/null @@ -1,6 +0,0 @@ -57bc67f71b8043961417325be13528d4f1e8ec90876cd34c38064431f457070f rootlesskit-aarch64.tar.gz -5154542509736957738478e3624b53865a875c396f978db5adea513d7507dee6 rootlesskit-armv7l.tar.gz -983642556dd3dcbe2c9b764d577882016ad1ca960815ffa13ca76d7da518504f rootlesskit-ppc64le.tar.gz -83c40bb8938828eb15837a4900ba825a1f52227631195c22df85f2e8f7f73546 rootlesskit-riscv64.tar.gz -dd6c8bc7e1c9b5d8c775efcf40854ef1d25205060294f0654a77d996a7f4e172 rootlesskit-s390x.tar.gz -caafdce18e0959f078b4b478d4f352ebf3d556e373265fc7831f1a6d70219ee0 rootlesskit-x86_64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.2 b/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.2 new file mode 100644 index 00000000000..9c7f6e338d0 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.2 @@ -0,0 +1,6 @@ +0a4ed18c6794bfe5821cc6548f52b26b3b2296170f05df194c2073545200d968 rootlesskit-aarch64.tar.gz +f9faaf3b91e02764eb8308c7a7da7de55311de9fea665ca1b2632421b9286bcc rootlesskit-armv7l.tar.gz +fc1120af52071dc2a6984eec8dfc74f5d973fb28fa6c6d7ec77523a636ebf641 rootlesskit-ppc64le.tar.gz +acc1d39483df101bfa204c8dbf61d2e7ac85b246b3e9c606dabeaaeededd0130 rootlesskit-riscv64.tar.gz +9e1c29b1b82162a71d435edf80898adcb5a41c0ec51202c36856276689eb7b52 rootlesskit-s390x.tar.gz +5d402d7995f1e2c369240de3c6f8eb4cc2a3d1f0f4877ac5362044b2e83962e9 rootlesskit-x86_64.tar.gz