Skip to content

Commit 8e36cde

Browse files
committed
build: bump Go toolchain to 1.26.5
Tailscale HEAD go.mod now requires go >= 1.26.5; build images pinned 1.26.4. Bump go.mod, the four Go Dockerfiles, and the nixpkgs pin (staging-next-26.05 ships go_1_26 1.26.5; unstable still lags).
1 parent 0483085 commit 8e36cde

8 files changed

Lines changed: 20 additions & 19 deletions

Dockerfile.derper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# For testing purposes only
22

3-
FROM golang:1.26.4-alpine AS build-env
3+
FROM golang:1.26.5-alpine AS build-env
44

55
WORKDIR /go/src
66

Dockerfile.integration

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# and are in no way endorsed by Headscale's maintainers as an
33
# official nor supported release or distribution.
44

5-
FROM docker.io/golang:1.26.4-trixie AS builder
5+
FROM docker.io/golang:1.26.5-trixie AS builder
66
ARG VERSION=dev
77
ENV GOPATH /go
88
WORKDIR /go/src/headscale

Dockerfile.tailscale-HEAD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This Dockerfile is more or less lifted from tailscale/tailscale
55
# to ensure a similar build process when testing the HEAD of tailscale.
66

7-
FROM golang:1.26.4-alpine AS build-env
7+
FROM golang:1.26.5-alpine AS build-env
88

99
WORKDIR /go/src
1010

Dockerfile.wasmclient

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# to drive a real browser-style WebSocket GET against headscale's /ts2021,
88
# guarding the regression in issue #3357.
99

10-
FROM golang:1.26.4-alpine AS build
10+
FROM golang:1.26.5-alpine AS build
1111

1212
WORKDIR /src
1313

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
description = "headscale - Open Source Tailscale Control server";
33

44
inputs = {
5-
# Pinned to staging-next-26.05 for Go 1.26.4 (security fix GO-2026-5037/5039):
6-
# nixpkgs-unstable still ships 1.26.3 — the bump is merged to nixpkgs staging
7-
# but the large-rebuild staging->unstable pipeline lags. The 26.05 line is
8-
# otherwise current (dev tools match unstable). Switch back to nixpkgs-unstable
9-
# once it ships go_1_26 >= 1.26.4.
5+
# Pinned to staging-next-26.05 for Go 1.26.5: the Tailscale HEAD build
6+
# (Dockerfile.tailscale-HEAD) requires go >= 1.26.5, and nixpkgs-unstable
7+
# still ships 1.26.4 — the bump is merged to nixpkgs staging but the
8+
# large-rebuild staging->unstable pipeline lags. The 26.05 line is otherwise
9+
# current (dev tools match unstable). Switch back to nixpkgs-unstable once it
10+
# ships go_1_26 >= 1.26.5.
1011
nixpkgs.url = "github:NixOS/nixpkgs/staging-next-26.05";
1112
flake-utils.url = "github:numtide/flake-utils";
1213
# Reusable Go flake checks (build/test/lint/format); CI runs them via
@@ -36,7 +37,7 @@
3637
overlays.default = _: prev:
3738
let
3839
pkgs = nixpkgs.legacyPackages.${prev.stdenv.hostPlatform.system};
39-
# Go 1.26 builder; resolves to Go 1.26.4 from the pinned nixpkgs.
40+
# Go 1.26 builder; resolves to Go 1.26.5 from the pinned nixpkgs.
4041
buildGo = pkgs.buildGo126Module;
4142
vendorHash = (builtins.fromJSON (builtins.readFile ./flakehashes.json)).vendor.sri;
4243
in
@@ -72,7 +73,7 @@
7273
};
7374

7475
# Build golangci-lint with stock Go 1.26 (upstream uses hardcoded Go
75-
# version); it does not build against the pinned 1.26.4.
76+
# version); it does not build against the pinned 1.26.5.
7677
golangci-lint = buildGo rec {
7778
pname = "golangci-lint";
7879
version = "2.12.2";

flakehashes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"vendor": {
3-
"goModSum": "sha256-SJml8RXGmb2p0g1nOsHn86FA1hwgd5ZffLSkUj5zek8=",
3+
"goModSum": "sha256-t1RAYi36JEii5nGldY546oWGD/3SwxQU09/pTrDadIk=",
44
"sri": "sha256-pjGNuVtgFFzWNq/2cK7a4iyF13AfcHz098nk92a9Ido="
55
}
66
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/juanfont/headscale
22

3-
go 1.26.4
3+
go 1.26.5
44

55
require (
66
github.com/arl/statsviz v0.8.0

0 commit comments

Comments
 (0)