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

bump containerd-dev to 2.0.2

Browse Source 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
This commit is contained in:
Avi Deitcher 2025-02-21 11:34:01 +02:00
parent 1d96f04934
commit c38f4e51ec
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/pkg/containerd/Dockerfile
View File

@ -9,6 +9,8 @@ RUN apk add --no-cache --initdb -p /out \
busybox \ busybox \
btrfs-progs \ btrfs-progs \
btrfs-progs-dev \ btrfs-progs-dev \
device-mapper \
e2fsprogs \
gcc \ gcc \
git \ git \
go \ go \
@ -17,8 +19,13 @@ RUN apk add --no-cache --initdb -p /out \
make \ make \
musl \ musl \
util-linux \ util-linux \
util-linux-misc \
xfsprogs \ xfsprogs \
tzdata 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 rm -rf /out/etc/apk /out/lib/apk /out/var/cache
RUN cp /out/usr/share/zoneinfo/UTC /out/etc/localtime RUN cp /out/usr/share/zoneinfo/UTC /out/etc/localtime
@ -26,8 +33,7 @@ FROM scratch
COPY --from=mirror /out/ / COPY --from=mirror /out/ /
COPY --from=containerd-dev /go/src/github.com/containerd/containerd /go/src/github.com/containerd/containerd/ COPY --from=containerd-dev /go/src/github.com/containerd/containerd /go/src/github.com/containerd/containerd/
# containerd 1.4.x does not support go modules; remove GO111MODULE=off when we switch to 1.5.x ENV GOPATH=/go
ENV GOPATH=/go GO111MODULE=off
WORKDIR $GOPATH/src/github.com/containerd/containerd WORKDIR $GOPATH/src/github.com/containerd/containerd
ADD run.sh ./run.sh ADD run.sh ./run.sh

10
tools/containerd-dev/Dockerfile
View File

@ -6,7 +6,9 @@ FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a as builder
# `test/pkg/containerd/Dockerfile` when changing this. # `test/pkg/containerd/Dockerfile` when changing this.
ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git
ENV CONTAINERD_COMMIT=v1.7.20 # this is a commit post-v2.0.2 that contains a fix necesary for tests to pass.
# it should be released with v2.0.3, which can be used once that release is available.
ENV CONTAINERD_COMMIT=3904a5761fadbb999d3fc1a7f7ab7cc6f6d7d850
ENV GOPATH=/go ENV GOPATH=/go
RUN apk add go git RUN apk add go git
RUN mkdir -p $GOPATH/src/github.com/containerd && \ RUN mkdir -p $GOPATH/src/github.com/containerd && \
@ -18,11 +20,11 @@ RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccom
WORKDIR $GOPATH/src/github.com/containerd/containerd WORKDIR $GOPATH/src/github.com/containerd/containerd
RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper" RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper"
RUN cp bin/containerd bin/ctr bin/containerd-shim bin/containerd-shim-runc-v2 /usr/bin/ RUN cp bin/containerd bin/ctr bin/containerd-shim-runc-v2 /usr/bin/
RUN strip /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2 RUN strip /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim-runc-v2
FROM scratch FROM scratch
ENTRYPOINT [] ENTRYPOINT []
WORKDIR / WORKDIR /
COPY --from=builder /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2 /usr/bin/ COPY --from=builder /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim-runc-v2 /usr/bin/
COPY --from=builder /go/src/github.com/containerd/containerd /go/src/github.com/containerd/containerd COPY --from=builder /go/src/github.com/containerd/containerd /go/src/github.com/containerd/containerd