Skip to content

Commit 85653bd

Browse files
Upgrade versions:
Go to 1.24. Containerd to v2.1.3. Runc to v1.3.0. Docker to 28.2.2. Signed-off-by: Jacob Weinstock <[email protected]>
1 parent 813fe44 commit 85653bd

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

images/hook-bootkit/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.6-alpine AS dev
1+
FROM golang:1.24-alpine AS dev
22
COPY . /src/
33
WORKDIR /src
44
RUN go mod download

images/hook-containerd/Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS builder
1+
FROM alpine:3.22 AS builder
22

33
ARG TARGETPLATFORM
44

@@ -7,38 +7,38 @@ ARG TARGETPLATFORM
77
# `test/pkg/containerd/Dockerfile` when changing this.
88
ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git
99

10-
ENV CONTAINERD_COMMIT=v1.7.15
11-
ENV NERDCTL_VERSION=1.7.6
10+
ENV CONTAINERD_COMMIT=v2.1.3
11+
ENV NERDCTL_VERSION=2.1.2
1212
ENV GOPATH=/go
13-
RUN apk add go git
13+
RUN apk add go=1.24.4-r0 git
1414
RUN mkdir -p $GOPATH/src/github.com/containerd && \
1515
cd $GOPATH/src/github.com/containerd && \
1616
git clone https://github.com/containerd/containerd.git && \
1717
cd $GOPATH/src/github.com/containerd/containerd && \
1818
git checkout $CONTAINERD_COMMIT
1919
RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccomp-dev
2020
WORKDIR $GOPATH/src/github.com/containerd/containerd
21-
RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-w -s -extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper"
21+
RUN make binaries STATIC=1 EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-w -s -extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper"
2222

2323
# install nerdctl
2424
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=arm64; else ARCHITECTURE=amd64; fi \
2525
&& wget https://github.com/containerd/nerdctl/releases/download/v${NERDCTL_VERSION}/nerdctl-${NERDCTL_VERSION}-linux-${ARCHITECTURE}.tar.gz \
2626
&& tar -zxvf nerdctl-${NERDCTL_VERSION}-linux-${ARCHITECTURE}.tar.gz -C /usr/local/bin/
2727

28-
RUN cp bin/containerd bin/ctr bin/containerd-shim bin/containerd-shim-runc-v2 /usr/bin/
29-
RUN strip /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2
28+
RUN cp bin/containerd bin/ctr bin/containerd-shim-runc-v2 /usr/bin/
29+
RUN strip /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim-runc-v2
3030
RUN mkdir -p /opt/containerd
3131

3232
FROM scratch AS containerd-dev
3333
ENTRYPOINT []
3434
WORKDIR /
35-
COPY --from=builder /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2 /usr/bin/
35+
COPY --from=builder /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim-runc-v2 /usr/bin/
3636
COPY --from=builder /go/src/github.com/containerd/containerd /go/src/github.com/containerd/containerd
3737
COPY --from=builder /usr/local/bin/nerdctl /usr/bin/
3838
COPY --from=builder /opt/containerd/ /opt/containerd/
3939

4040
# Dockerfile to build linuxkit/containerd for linuxkit
41-
FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS alpine
41+
FROM alpine:3.22 AS alpine
4242

4343
RUN apk add tzdata binutils
4444
RUN mkdir -p /etc/init.d && ln -s /usr/bin/service /etc/init.d/020-containerd
@@ -48,7 +48,7 @@ FROM containerd-dev
4848
FROM scratch
4949
ENTRYPOINT []
5050
WORKDIR /
51-
COPY --from=containerd-dev /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2 /usr/bin/
51+
COPY --from=containerd-dev /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim-runc-v2 /usr/bin/
5252
COPY --from=containerd-dev /usr/bin/nerdctl /usr/bin/
5353
COPY --from=containerd-dev /opt/containerd/ /opt/containerd/
5454
COPY --from=alpine /usr/share/zoneinfo/UTC /etc/localtime

images/hook-docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM golang:1.20-alpine AS dev
1+
FROM golang:1.24-alpine AS dev
22
COPY . /src/
33
WORKDIR /src
44
RUN CGO_ENABLED=0 go build -a -ldflags '-s -w -extldflags "-static"' -o /hook-docker
55

6-
FROM docker:26.1.0-dind
6+
FROM docker:28.2.2-dind
77
RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
88
RUN apk update && apk add kexec-tools binutils && rm -rf /var/cache/apk/*
99
# Won't use docker-buildx nor docker-compose

images/hook-runc/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# Dockerfile to build linuxkit/runc for linuxkit
2-
FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS alpine
2+
FROM alpine:3.22 AS alpine
33
RUN \
44
apk add \
55
bash \
66
gcc \
77
git \
8-
go \
8+
go=1.24.4-r0 \
99
libc-dev \
1010
libseccomp-dev \
1111
libseccomp-static \
1212
linux-headers \
1313
make \
1414
&& true
1515
ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
16-
ENV RUNC_COMMIT=v1.1.12
16+
ENV RUNC_COMMIT=v1.3.0
1717
RUN mkdir -p $GOPATH/src/github.com/opencontainers && \
1818
cd $GOPATH/src/github.com/opencontainers && \
1919
git clone https://github.com/opencontainers/runc.git

0 commit comments

Comments
 (0)