From ef02692a91c04006d5750ae81516a40ff3bb6450 Mon Sep 17 00:00:00 2001
From: Kay Yan <kay.yan@daocloud.io>
Date: Tue, 17 Dec 2024 06:34:03 +0000
Subject: [PATCH] update containerd (2.0.1), runc (1.2.3), buildKit (0.18.2),
 stargz-snapshotter (0.16.3)

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
---
 .github/workflows/test.yml                           | 12 ++++++------
 Dockerfile                                           | 10 +++++-----
 Dockerfile.d/SHA256SUMS.d/buildkit-v0.18.1           |  2 --
 Dockerfile.d/SHA256SUMS.d/buildkit-v0.18.2           |  2 ++
 Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-v0.16.2 |  3 ---
 Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-v0.16.3 |  3 +++
 6 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.18.1
 create mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.18.2
 delete mode 100644 Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-v0.16.2
 create mode 100644 Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-v0.16.3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5aa31126a8a..29eb8273674 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,10 +31,10 @@ jobs:
             containerd: v1.7.24
             arch: amd64
           - runner: ubuntu-24.04
-            containerd: v2.0.0
+            containerd: v2.0.1
             arch: amd64
           - runner: arm64-8core-32gb
-            containerd: v2.0.0
+            containerd: v2.0.1
             arch: arm64
     env:
       CONTAINERD_VERSION: "${{ matrix.containerd }}"
@@ -113,11 +113,11 @@ jobs:
             runner: "ubuntu-22.04"
             arch: amd64
           - ubuntu: 24.04
-            containerd: v2.0.0
+            containerd: v2.0.1
             runner: "ubuntu-24.04"
             arch: amd64
           - ubuntu: 24.04
-            containerd: v2.0.0
+            containerd: v2.0.1
             runner: arm64-8core-32gb
             arch: arm64
     env:
@@ -167,7 +167,7 @@ jobs:
       matrix:
         include:
           - ubuntu: 24.04
-            containerd: v2.0.0
+            containerd: v2.0.1
             arch: amd64
     env:
       CONTAINERD_VERSION: "${{ matrix.containerd }}"
@@ -239,7 +239,7 @@ jobs:
             target: rootless
             arch: amd64
           - ubuntu: 24.04
-            containerd: v2.0.0
+            containerd: v2.0.1
             rootlesskit: v2.3.1
             target: rootless
             arch: amd64
diff --git a/Dockerfile b/Dockerfile
index 5715dcab591..e7870b673a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,16 +18,16 @@
 # TODO: verify commit hash
 
 # Basic deps
-ARG CONTAINERD_VERSION=v2.0.0
-ARG RUNC_VERSION=v1.2.2
+ARG CONTAINERD_VERSION=v2.0.1
+ARG RUNC_VERSION=v1.2.3
 ARG CNI_PLUGINS_VERSION=v1.6.1
 
 # Extra deps: Build
-ARG BUILDKIT_VERSION=v0.18.1
+ARG BUILDKIT_VERSION=v0.18.2
 # Extra deps: Lazy-pulling
-ARG STARGZ_SNAPSHOTTER_VERSION=v0.16.2
+ARG STARGZ_SNAPSHOTTER_VERSION=v0.16.3
 # Extra deps: Encryption
-ARG IMGCRYPT_VERSION=v2.0.0-rc.1
+ARG IMGCRYPT_VERSION=v2.0.0
 # Extra deps: Rootless
 ARG ROOTLESSKIT_VERSION=v2.3.1
 ARG SLIRP4NETNS_VERSION=v1.3.1
diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.18.1 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.18.1
deleted file mode 100644
index 34d303dafcd..00000000000
--- a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.18.1
+++ /dev/null
@@ -1,2 +0,0 @@
-02b986569330f09dc837486f80d9818812aba1ac8bd892b337adeb56eafe3794  buildkit-v0.18.1.linux-amd64.tar.gz
-484a725519bd15a3b3d1f84c2dfc37749af6f06bc6c40d83395312e4d1fb18f1  buildkit-v0.18.1.linux-arm64.tar.gz
diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.18.2 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.18.2
new file mode 100644
index 00000000000..5a2660e6c67
--- /dev/null
+++ b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.18.2
@@ -0,0 +1,2 @@
+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/stargz-snapshotter-v0.16.2 b/Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-v0.16.2
deleted file mode 100644
index c1aba6628f2..00000000000
--- a/Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-v0.16.2
+++ /dev/null
@@ -1,3 +0,0 @@
-1958c8eb6275fccc3f7a987eab286fefb68045d79c331660d7253e7f5be20bc0  stargz-snapshotter-v0.16.2-linux-amd64.tar.gz
-fc518ac49bb97708b2a0751bedce1bc2c146a9cec7ffdd9c0830a4dc0fd97e17  stargz-snapshotter-v0.16.2-linux-arm64.tar.gz
-f1cf855870af16a653d8acb9daa3edf84687c2c05323cb958f078fb148af3eec  stargz-snapshotter.service
diff --git a/Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-v0.16.3 b/Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-v0.16.3
new file mode 100644
index 00000000000..e9b2bfa457c
--- /dev/null
+++ b/Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-v0.16.3
@@ -0,0 +1,3 @@
+516984d13e10396f7f6090c51e4e42cc1af9a0d4b16aa81837bcdb1d5a5608d6  stargz-snapshotter-v0.16.3-linux-amd64.tar.gz
+d3ac8215603cfd002901c88c568ff5c0685d6953c012fa6ff709deb50f90b023  stargz-snapshotter-v0.16.3-linux-arm64.tar.gz
+f1cf855870af16a653d8acb9daa3edf84687c2c05323cb958f078fb148af3eec  stargz-snapshotter.service