Skip to content

Commit 2f760f6

Browse files
Changes:
- move blkio code to a separate file - return block device paths instead of major:minor numbers - update blkio device tests to use blk devices in place of char devices Signed-off-by: Swapnanil-Gupta <[email protected]>
1 parent 8d3ad04 commit 2f760f6

33 files changed

+507
-235
lines changed

.github/workflows/job-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
5353
- if: ${{ env.GO_VERSION != '' }}
5454
name: "Init: install go"
55-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
55+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
5656
with:
5757
go-version: ${{ env.GO_VERSION }}
5858
check-latest: true

.github/workflows/job-lint-go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
5656
- if: ${{ env.GO_VERSION != '' }}
5757
name: "Init: install go"
58-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
58+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
5959
with:
6060
go-version: ${{ env.GO_VERSION }}
6161
check-latest: true

.github/workflows/job-lint-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
path: src/github.com/containerd/nerdctl
3737

3838
- name: "Init: install go"
39-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
39+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
4040
with:
4141
go-version: ${{ inputs.go-version }}
4242
check-latest: true

.github/workflows/job-test-in-host.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
9797
- if: ${{ env.SHOULD_RUN == 'yes' }}
9898
name: "Init: install go"
99-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
99+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
100100
with:
101101
go-version: ${{ env.GO_VERSION }}
102102
check-latest: true

.github/workflows/job-test-unit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
6464
- if: ${{ env.GO_VERSION != '' }}
6565
name: "Init: install go"
66-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
66+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
6767
with:
6868
go-version: ${{ env.GO_VERSION }}
6969
check-latest: true

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: "Set up QEMU"
2929
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
3030
- name: "Install go"
31-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
31+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
3232
with:
3333
go-version: "1.25"
3434
check-latest: true

.github/workflows/workflow-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ jobs:
141141
go-version: 1.25
142142
windows-cni-version: v0.3.1
143143
docker-version: 5:28.0.4-1~ubuntu.24.04~noble
144-
containerd-version: 2.1.3
144+
containerd-version: 2.1.4
145145
# Note: these as for amd64
146-
containerd-sha: 436cc160c33b37ec25b89fb5c72fc879ab2b3416df5d7af240c3e9c2f4065d3c
146+
containerd-sha: 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515
147147
containerd-service-sha: 1941362cbaa89dd591b99c32b050d82c583d3cd2e5fa63085d7017457ec5fca8
148-
linux-cni-version: v1.7.1
149-
linux-cni-sha: 1a28a0506bfe5bcdc981caf1a49eeab7e72da8321f1119b7be85f22621013098
148+
linux-cni-version: v1.8.0
149+
linux-cni-sha: ab3bda535f9d90766cccc90d3dddb5482003dd744d7f22bcf98186bf8eea8be6

.github/workflows/workflow-tigron.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
echo "::warning title=No canary go::There is currently no canary go version to test. Steps will not run."
4747
- if: ${{ env.GO_VERSION != '' }}
4848
name: "Install go"
49-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
49+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
5050
with:
5151
go-version: ${{ env.GO_VERSION }}
5252
check-latest: true

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717

1818
# Basic deps
1919
# @BINARY: the binary checksums are verified via Dockerfile.d/SHA256SUMS.d/<COMPONENT>-<VERSION>
20-
ARG CONTAINERD_VERSION=v2.1.3@c787fb98911740dd3ff2d0e45ce88cdf01410486
21-
ARG RUNC_VERSION=v1.3.0@4ca628d1d4c974f92d24daccb901aa078aad748e
22-
ARG CNI_PLUGINS_VERSION=v1.7.1@BINARY
20+
ARG CONTAINERD_VERSION=v2.1.4@75cb2b7193e4e490e9fbdc236c0e811ccaba3376
21+
ARG RUNC_VERSION=v1.3.1@e6457afc48eff1ce22dece664932395026a7105e
22+
ARG CNI_PLUGINS_VERSION=v1.8.0@BINARY
2323

2424
# Extra deps: Build
25-
ARG BUILDKIT_VERSION=v0.23.2@BINARY
25+
ARG BUILDKIT_VERSION=v0.24.0@BINARY
2626
# Extra deps: Lazy-pulling
27-
ARG STARGZ_SNAPSHOTTER_VERSION=v0.16.3@BINARY
27+
ARG STARGZ_SNAPSHOTTER_VERSION=v0.17.0@BINARY
2828
# Extra deps: Encryption
2929
ARG IMGCRYPT_VERSION=v2.0.1@c377ec98ff79ec9205eabf555ebd2ea784738c6c
3030
# Extra deps: Rootless
@@ -48,14 +48,14 @@ ARG GO_VERSION=1.25
4848
ARG UBUNTU_VERSION=24.04
4949
ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
5050
ARG GOTESTSUM_VERSION=v1.12.3
51-
ARG NYDUS_VERSION=v2.3.2
51+
ARG NYDUS_VERSION=v2.3.5
5252
ARG SOCI_SNAPSHOTTER_VERSION=0.11.1
5353
ARG KUBO_VERSION=v0.37.0
5454

5555
FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.6.1@sha256:923441d7c25f1e2eb5789f82d987693c47b8ed987c4ab3b075d6ed2b5d6779a3 AS xx
5656

5757

58-
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bookworm AS build-base
58+
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-trixie AS build-base
5959
COPY --from=xx / /
6060
ENV DEBIAN_FRONTEND=noninteractive
6161
RUN apt-get update -qq && apt-get install -qq --no-install-recommends \

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

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)