github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

containerd v2.0.3 plus commits to fix blkdiscard

Browse Source 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
This commit is contained in:
Avi Deitcher 2025-03-06 09:39:34 +02:00
parent aadf3b4407
commit cd56a10978
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/pkg/containerd/Dockerfile
View File

@ -23,9 +23,6 @@ RUN apk add --no-cache --initdb -p /out \
xfsprogs \
tzdata
# because we want the one from util-linux-misc at /sbin/blkdiscard to override the one from busybox
RUN rm /out/usr/bin/blkdiscard
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
RUN cp /out/usr/share/zoneinfo/UTC /out/etc/localtime

6
tools/containerd-dev/Dockerfile
View File

@ -6,7 +6,11 @@ FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a as builder
# `test/pkg/containerd/Dockerfile` when changing this.
ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git
ENV CONTAINERD_COMMIT=v2.0.3
# this commit is post-v2.0.3 and includes the fix for the blkdiscard issue
# which is necessary for the root tests to pass when running on Alpine.
# Once it is in semver, likely v2.0.4, we can switch to that.
# See PR https://github.com/containerd/containerd/pull/11330
ENV CONTAINERD_COMMIT=f35b7dae5f1f4f1277e4c39b89acb0a8ea669c48
ENV GOPATH=/go
RUN apk add go git
RUN mkdir -p $GOPATH/src/github.com/containerd && \