Merge pull request #3320 from AkihiroSuda/dev

update Go (1.23), BuildKit (0.15.2), RootlessKit (2.3.1), and test deps

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
     - uses: actions/[email protected]
     - uses: actions/setup-go@v5
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
     - name: "Compile binaries"
       run: make artifacts
     - name: "SHA256SUMS"

.github/workflows/test.yml

@@ -10,7 +10,7 @@ on:
       - '**.md'
 
 env:
-  GO_VERSION: 1.22.x
+  GO_VERSION: 1.23.x
 
 jobs:
   lint:
@@ -28,7 +28,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
-          version: v1.59.1
+          version: v1.60.1
           args: --verbose
       - name: yamllint-lint
         run: make lint-yaml
@@ -170,15 +170,15 @@ jobs:
             target: test-integration-rootless
           - ubuntu: 22.04
             containerd: v1.7.19
-            rootlesskit: v2.1.0
+            rootlesskit: v2.3.1
             target: test-integration-rootless
           - ubuntu: 24.04
             containerd: v2.0.0-rc.3
-            rootlesskit: v2.1.0
+            rootlesskit: v2.3.1
             target: test-integration-rootless
           - ubuntu: 24.04
             containerd: v1.7.19
-            rootlesskit: v2.1.0
+            rootlesskit: v2.3.1
             target: test-integration-rootless-port-slirp4netns
     env:
       UBUNTU_VERSION: "${{ matrix.ubuntu }}"
@@ -236,7 +236,7 @@ jobs:
     timeout-minutes: 40
     strategy:
       matrix:
-        go-version: ["1.21.x", "1.22.x"]
+        go-version: ["1.22.x", "1.23.x"]
     steps:
       - uses: actions/[email protected]
         with:

Dockerfile

@@ -23,13 +23,13 @@ ARG RUNC_VERSION=v1.1.13
 ARG CNI_PLUGINS_VERSION=v1.5.1
 
 # Extra deps: Build
-ARG BUILDKIT_VERSION=v0.15.0
+ARG BUILDKIT_VERSION=v0.15.2
 # Extra deps: Lazy-pulling
 ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1
 # Extra deps: Encryption
 ARG IMGCRYPT_VERSION=v1.1.11
 # Extra deps: Rootless
-ARG ROOTLESSKIT_VERSION=v2.1.0
+ARG ROOTLESSKIT_VERSION=v2.3.1
 ARG SLIRP4NETNS_VERSION=v1.3.1
 # Extra deps: bypass4netns
 ARG BYPASS4NETNS_VERSION=v0.4.1
@@ -44,22 +44,21 @@ ARG TINI_VERSION=v0.19.0
 ARG BUILDG_VERSION=v0.4.1
 
 # Test deps
-ARG GO_VERSION=1.22
+ARG GO_VERSION=1.23
 ARG UBUNTU_VERSION=24.04
 ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
 ARG GOTESTSUM_VERSION=v1.12.0
 ARG NYDUS_VERSION=v2.2.5
-ARG SOCI_SNAPSHOTTER_VERSION=0.6.1
+ARG SOCI_SNAPSHOTTER_VERSION=0.7.0
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.4.0 AS xx
 
 
-FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bullseye AS build-base-debian
+FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bookworm AS build-base-debian
 COPY --from=xx / /
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
     git \
-    pkg-config \
     dpkg-dev
 ARG TARGETARCH
 # libbtrfs: for containerd
@@ -69,7 +68,8 @@ RUN xx-apt-get update -qq && xx-apt-get install -qq --no-install-recommends \
     gcc \
     libc6-dev \
     libbtrfs-dev \
-    libseccomp-dev
+    libseccomp-dev \
+    pkg-config
 
 FROM build-base-debian AS build-containerd
 ARG TARGETARCH

Dockerfile.d/SHA256SUMS.d/buildkit-v0.15.2

@@ -0,0 +1,2 @@
+59279df5853bef19a03ec15c5c31b772e59d91d079ab0221e1bafa023cf41c35  buildkit-v0.15.2.linux-amd64.tar.gz
+15329adaa5e5b2bea0580f3e5e33765f84504075710bb791e362c3b160ca7e61  buildkit-v0.15.2.linux-arm64.tar.gz

Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.1

@@ -0,0 +1,6 @@
+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

hack/build-integration-kube.sh

@@ -21,8 +21,8 @@ readonly root
 # shellcheck source=/dev/null
 . "$root/scripts/lib.sh"
 
-GO_VERSION=1.22
-KIND_VERSION=v0.23.0
+GO_VERSION=1.23
+KIND_VERSION=v0.24.0
 
 [ "$(uname -m)" == "aarch64" ] && GOARCH=arm64 || GOARCH=amd64