From 4bd614a559ea52bb7c77983b61247d23299237df Mon Sep 17 00:00:00 2001 From: Florian Preinstorfer Date: Mon, 27 Oct 2025 20:29:41 +0100 Subject: [PATCH] Use current stable base images for Debian and Alpine --- Dockerfile.derper | 2 +- Dockerfile.integration | 5 ++--- Dockerfile.tailscale-HEAD | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile.derper b/Dockerfile.derper index 62adc7cf..395d9586 100644 --- a/Dockerfile.derper +++ b/Dockerfile.derper @@ -12,7 +12,7 @@ WORKDIR /go/src/tailscale ARG TARGETARCH RUN GOARCH=$TARGETARCH go install -v ./cmd/derper -FROM alpine:3.18 +FROM alpine:3.22 RUN apk add --no-cache ca-certificates iptables iproute2 ip6tables curl COPY --from=build-env /go/bin/* /usr/local/bin/ diff --git a/Dockerfile.integration b/Dockerfile.integration index 6baf4564..72becdf9 100644 --- a/Dockerfile.integration +++ b/Dockerfile.integration @@ -2,13 +2,12 @@ # and are in no way endorsed by Headscale's maintainers as an # official nor supported release or distribution. -FROM docker.io/golang:1.25-bookworm +FROM docker.io/golang:1.25-trixie ARG VERSION=dev ENV GOPATH /go WORKDIR /go/src/headscale -RUN apt-get update \ - && apt-get install --no-install-recommends --yes less jq sqlite3 dnsutils \ +RUN apt-get --update install --no-install-recommends --yes less jq sqlite3 dnsutils \ && rm -rf /var/lib/apt/lists/* \ && apt-get clean RUN mkdir -p /var/run/headscale diff --git a/Dockerfile.tailscale-HEAD b/Dockerfile.tailscale-HEAD index 43e68992..240d528b 100644 --- a/Dockerfile.tailscale-HEAD +++ b/Dockerfile.tailscale-HEAD @@ -36,7 +36,7 @@ RUN GOARCH=$TARGETARCH go install -tags="${BUILD_TAGS}" -ldflags="\ -X tailscale.com/version.gitCommitStamp=$VERSION_GIT_HASH" \ -v ./cmd/tailscale ./cmd/tailscaled ./cmd/containerboot -FROM alpine:3.18 +FROM alpine:3.22 RUN apk add --no-cache ca-certificates iptables iproute2 ip6tables curl COPY --from=build-env /go/bin/* /usr/local/bin/