Skip to content

Commit 778975f

Browse files
authored
Merge pull request #3320 from AkihiroSuda/dev
update Go (1.23), BuildKit (0.15.2), RootlessKit (2.3.1), and test deps
2 parents a59f8f1 + 613f7c6 commit 778975f

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

Diff for: .github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/[email protected]
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: 1.22.x
16+
go-version: 1.23.x
1717
- name: "Compile binaries"
1818
run: make artifacts
1919
- name: "SHA256SUMS"

Diff for: .github/workflows/test.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- '**.md'
1111

1212
env:
13-
GO_VERSION: 1.22.x
13+
GO_VERSION: 1.23.x
1414

1515
jobs:
1616
lint:
@@ -28,7 +28,7 @@ jobs:
2828
- name: golangci-lint
2929
uses: golangci/[email protected]
3030
with:
31-
version: v1.59.1
31+
version: v1.60.1
3232
args: --verbose
3333
- name: yamllint-lint
3434
run: make lint-yaml
@@ -170,15 +170,15 @@ jobs:
170170
target: test-integration-rootless
171171
- ubuntu: 22.04
172172
containerd: v1.7.19
173-
rootlesskit: v2.1.0
173+
rootlesskit: v2.3.1
174174
target: test-integration-rootless
175175
- ubuntu: 24.04
176176
containerd: v2.0.0-rc.3
177-
rootlesskit: v2.1.0
177+
rootlesskit: v2.3.1
178178
target: test-integration-rootless
179179
- ubuntu: 24.04
180180
containerd: v1.7.19
181-
rootlesskit: v2.1.0
181+
rootlesskit: v2.3.1
182182
target: test-integration-rootless-port-slirp4netns
183183
env:
184184
UBUNTU_VERSION: "${{ matrix.ubuntu }}"
@@ -236,7 +236,7 @@ jobs:
236236
timeout-minutes: 40
237237
strategy:
238238
matrix:
239-
go-version: ["1.21.x", "1.22.x"]
239+
go-version: ["1.22.x", "1.23.x"]
240240
steps:
241241
- uses: actions/[email protected]
242242
with:

Diff for: Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ ARG RUNC_VERSION=v1.1.13
2323
ARG CNI_PLUGINS_VERSION=v1.5.1
2424

2525
# Extra deps: Build
26-
ARG BUILDKIT_VERSION=v0.15.0
26+
ARG BUILDKIT_VERSION=v0.15.2
2727
# Extra deps: Lazy-pulling
2828
ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1
2929
# Extra deps: Encryption
3030
ARG IMGCRYPT_VERSION=v1.1.11
3131
# Extra deps: Rootless
32-
ARG ROOTLESSKIT_VERSION=v2.1.0
32+
ARG ROOTLESSKIT_VERSION=v2.3.1
3333
ARG SLIRP4NETNS_VERSION=v1.3.1
3434
# Extra deps: bypass4netns
3535
ARG BYPASS4NETNS_VERSION=v0.4.1
@@ -44,22 +44,21 @@ ARG TINI_VERSION=v0.19.0
4444
ARG BUILDG_VERSION=v0.4.1
4545

4646
# Test deps
47-
ARG GO_VERSION=1.22
47+
ARG GO_VERSION=1.23
4848
ARG UBUNTU_VERSION=24.04
4949
ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
5050
ARG GOTESTSUM_VERSION=v1.12.0
5151
ARG NYDUS_VERSION=v2.2.5
52-
ARG SOCI_SNAPSHOTTER_VERSION=0.6.1
52+
ARG SOCI_SNAPSHOTTER_VERSION=0.7.0
5353

5454
FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.4.0 AS xx
5555

5656

57-
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bullseye AS build-base-debian
57+
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bookworm AS build-base-debian
5858
COPY --from=xx / /
5959
ENV DEBIAN_FRONTEND=noninteractive
6060
RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
6161
git \
62-
pkg-config \
6362
dpkg-dev
6463
ARG TARGETARCH
6564
# libbtrfs: for containerd
@@ -69,7 +68,8 @@ RUN xx-apt-get update -qq && xx-apt-get install -qq --no-install-recommends \
6968
gcc \
7069
libc6-dev \
7170
libbtrfs-dev \
72-
libseccomp-dev
71+
libseccomp-dev \
72+
pkg-config
7373

7474
FROM build-base-debian AS build-containerd
7575
ARG TARGETARCH

Diff for: Dockerfile.d/SHA256SUMS.d/buildkit-v0.15.0

-2
This file was deleted.

Diff for: Dockerfile.d/SHA256SUMS.d/buildkit-v0.15.2

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

Diff for: Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.1.0

-6
This file was deleted.

Diff for: Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.1

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
57bc67f71b8043961417325be13528d4f1e8ec90876cd34c38064431f457070f rootlesskit-aarch64.tar.gz
2+
5154542509736957738478e3624b53865a875c396f978db5adea513d7507dee6 rootlesskit-armv7l.tar.gz
3+
983642556dd3dcbe2c9b764d577882016ad1ca960815ffa13ca76d7da518504f rootlesskit-ppc64le.tar.gz
4+
83c40bb8938828eb15837a4900ba825a1f52227631195c22df85f2e8f7f73546 rootlesskit-riscv64.tar.gz
5+
dd6c8bc7e1c9b5d8c775efcf40854ef1d25205060294f0654a77d996a7f4e172 rootlesskit-s390x.tar.gz
6+
caafdce18e0959f078b4b478d4f352ebf3d556e373265fc7831f1a6d70219ee0 rootlesskit-x86_64.tar.gz

Diff for: hack/build-integration-kube.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ readonly root
2121
# shellcheck source=/dev/null
2222
. "$root/scripts/lib.sh"
2323

24-
GO_VERSION=1.22
25-
KIND_VERSION=v0.23.0
24+
GO_VERSION=1.23
25+
KIND_VERSION=v0.24.0
2626

2727
[ "$(uname -m)" == "aarch64" ] && GOARCH=arm64 || GOARCH=amd64
2828

0 commit comments

Comments
 (0)