From 78570c754f2bd2a155429de05fbe1985ae60675f Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Tue, 19 May 2026 09:12:01 +0000 Subject: [PATCH] Dockerfile: bump base images Bump golang to 1.26.3, alpine to 3.23, rust to 1.95 across the integration, derper, tailscale-HEAD, and tailscale-rs Dockerfiles. --- Dockerfile.derper | 2 +- Dockerfile.integration | 2 +- Dockerfile.tailscale-HEAD | 2 +- Dockerfile.tailscale-rs | 4 ++-- go.mod | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.derper b/Dockerfile.derper index 0deb69e4..7268b936 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.22 +FROM alpine:3.23 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 c897ab8d..37b0e420 100644 --- a/Dockerfile.integration +++ b/Dockerfile.integration @@ -2,7 +2,7 @@ # and are in no way endorsed by Headscale's maintainers as an # official nor supported release or distribution. -FROM docker.io/golang:1.26.2-trixie AS builder +FROM docker.io/golang:1.26.3-trixie AS builder ARG VERSION=dev ENV GOPATH /go WORKDIR /go/src/headscale diff --git a/Dockerfile.tailscale-HEAD b/Dockerfile.tailscale-HEAD index 7d0d43bf..83f331a2 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.22 +FROM alpine:3.23 # Upstream: ca-certificates ip6tables iptables iproute2 # Tests: curl python3 (traceroute via BusyBox) RUN apk add --no-cache ca-certificates curl ip6tables iptables iproute2 python3 diff --git a/Dockerfile.tailscale-rs b/Dockerfile.tailscale-rs index c6040923..04376477 100644 --- a/Dockerfile.tailscale-rs +++ b/Dockerfile.tailscale-rs @@ -1,4 +1,4 @@ -FROM rust:1.94-bookworm AS builder +FROM rust:1.95-trixie AS builder ARG TAILSCALE_RS_REPO=https://github.com/tailscale/tailscale-rs.git ARG TAILSCALE_RS_REF=main @@ -15,7 +15,7 @@ RUN sed -i '/^axum = \["dep:axum"\]/a insecure-keyfetch = ["ts_control/insecure- RUN cargo build --release --features axum,insecure-keyfetch --example axum -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/go.mod b/go.mod index f2d68086..cb8d955d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/juanfont/headscale -go 1.26.2 +go 1.26.3 require ( github.com/arl/statsviz v0.8.0