Skip to content

Commit 05ab86f

Browse files
authored
Merge pull request containerd#4494 from AkihiroSuda/dev
update containerd (2.1.4), stargz-snapshotter (0.17.0), ...
2 parents 8d3ad04 + 0a4c6cd commit 05ab86f

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

.github/workflows/workflow-test.yml

Lines changed: 2 additions & 2 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
148148
linux-cni-version: v1.7.1
149149
linux-cni-sha: 1a28a0506bfe5bcdc981caf1a49eeab7e72da8321f1119b7be85f22621013098

Dockerfile

Lines changed: 4 additions & 4 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
20+
ARG CONTAINERD_VERSION=v2.1.4@75cb2b7193e4e490e9fbdc236c0e811ccaba3376
2121
ARG RUNC_VERSION=v1.3.0@4ca628d1d4c974f92d24daccb901aa078aad748e
2222
ARG CNI_PLUGINS_VERSION=v1.7.1@BINARY
2323

2424
# Extra deps: Build
2525
ARG BUILDKIT_VERSION=v0.23.2@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/stargz-snapshotter-v0.16.3

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
e3cd9aed03a0fc82adc2484a3fe94381d21f52d998419e15ca019744d27e18b7 stargz-snapshotter-v0.17.0-linux-amd64.tar.gz
2+
9b3e85729885d7b5c4a3b7b67a8c8048065f60b2098fec17251f256d49bb24bb stargz-snapshotter-v0.17.0-linux-arm64.tar.gz
3+
f1cf855870af16a653d8acb9daa3edf84687c2c05323cb958f078fb148af3eec stargz-snapshotter.service

docs/dev/auditing_dockerfile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ is the local ip of the Charles proxy (non-localhost)
3434

3535
Add the following stages in the dockerfile:
3636
```dockerfile
37-
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bookworm AS hack-build-base-debian
37+
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-trixie AS hack-build-base-debian
3838
RUN apt-get update -qq; apt-get -qq install ca-certificates
3939
COPY charles-ssl-proxying-certificate.crt /usr/local/share/ca-certificates/
4040
RUN update-ca-certificates
@@ -52,7 +52,7 @@ RUN update-ca-certificates
5252

5353
Then replace any later "FROM" with our modified bases:
5454
```
55-
golang:${GO_VERSION}-bookworm => hack-build-base-debian
55+
golang:${GO_VERSION}-trixie => hack-build-base-debian
5656
golang:${GO_VERSION}-alpine => hack-build-base
5757
ubuntu:${UBUNTU_VERSION} => hack-base
5858
```

0 commit comments

Comments
 (0)