Upgrade versions; Slim down hook-docker:

files/dhcp.sh

@@ -9,11 +9,11 @@ set -x
 
 run_dhcp_client() {
 	one_shot="$1"
-	al="en*"
+	al="e*"
 
 	vlan_id=$(sed -n 's/.* vlan_id=\([0-9]*\).*/\1/p' /proc/cmdline)
 	if [ -n "$vlan_id" ]; then
-		al="en*.*"
+		al="e*.*"
 	fi
 
 	if [ "$one_shot" = "true" ]; then

images/hook-bootkit/Dockerfile

@@ -1,9 +1,9 @@
-FROM golang:1.22.6-alpine AS dev
+FROM golang:1.24-alpine AS dev
 COPY . /src/
 WORKDIR /src
 RUN go mod download
 RUN CGO_ENABLED=0 go build -a -ldflags '-s -w -extldflags "-static"' -o /bootkit
 
-FROM alpine
+FROM scratch
 COPY --from=dev /bootkit .
 ENTRYPOINT ["/bootkit"]

images/hook-containerd/Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS builder
+FROM alpine:3.22 AS builder
 
 ARG TARGETPLATFORM
 
@@ -7,38 +7,38 @@ ARG TARGETPLATFORM
 # `test/pkg/containerd/Dockerfile` when changing this.
 ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git
 
-ENV CONTAINERD_COMMIT=v1.7.15
-ENV NERDCTL_VERSION=1.7.6
+ENV CONTAINERD_COMMIT=v2.1.3
+ENV NERDCTL_VERSION=2.1.2
 ENV GOPATH=/go
-RUN apk add go git
+RUN apk add go=1.24.4-r0 git
 RUN mkdir -p $GOPATH/src/github.com/containerd && \
   cd $GOPATH/src/github.com/containerd && \
   git clone https://github.com/containerd/containerd.git && \
   cd $GOPATH/src/github.com/containerd/containerd && \
   git checkout $CONTAINERD_COMMIT
 RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccomp-dev
 WORKDIR $GOPATH/src/github.com/containerd/containerd
-RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-w -s -extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper"
+RUN make binaries STATIC=1 EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-w -s -extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper"
 
 # install nerdctl
 RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=arm64; else ARCHITECTURE=amd64; fi \
   && wget https://github.com/containerd/nerdctl/releases/download/v${NERDCTL_VERSION}/nerdctl-${NERDCTL_VERSION}-linux-${ARCHITECTURE}.tar.gz \
   && tar -zxvf nerdctl-${NERDCTL_VERSION}-linux-${ARCHITECTURE}.tar.gz -C /usr/local/bin/
 
-RUN cp bin/containerd bin/ctr bin/containerd-shim 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 cp bin/containerd bin/ctr bin/containerd-shim-runc-v2 /usr/bin/
+RUN strip /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim-runc-v2
 RUN mkdir -p /opt/containerd
 
 FROM scratch AS containerd-dev
 ENTRYPOINT []
 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 /usr/local/bin/nerdctl /usr/bin/
 COPY --from=builder /opt/containerd/ /opt/containerd/
 
 # Dockerfile to build linuxkit/containerd for linuxkit
-FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS alpine
+FROM alpine:3.22 AS alpine
 
 RUN apk add tzdata binutils
 RUN mkdir -p /etc/init.d && ln -s /usr/bin/service /etc/init.d/020-containerd
@@ -48,7 +48,7 @@ FROM containerd-dev
 FROM scratch
 ENTRYPOINT []
 WORKDIR /
-COPY --from=containerd-dev /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2 /usr/bin/
+COPY --from=containerd-dev /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim-runc-v2 /usr/bin/
 COPY --from=containerd-dev /usr/bin/nerdctl /usr/bin/
 COPY --from=containerd-dev /opt/containerd/ /opt/containerd/
 COPY --from=alpine /usr/share/zoneinfo/UTC /etc/localtime