Skip to content

Commit 9dfe889

Browse files
mikeodrmostlygeek
andauthored
.github,Dockerfile,go.mod,flake: update go version and tsidp version (#152)
- Update tailscale version to 1.94.2 - Update go to 1.26 for nix, github actions, docker builder - Go 1.26 isn't available in nix upstream, build it locally as dependency Signed-off-by: Mike O'Driscoll <mikeo@tailscale.com> Co-authored-by: Benson Wong <benson@tailscale.com>
1 parent 4c2b5ae commit 9dfe889

6 files changed

Lines changed: 133 additions & 126 deletions

File tree

.github/workflows/ci-linux.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v4
2222
with:
23-
go-version: '1.24.9'
23+
go-version: '1.26'
2424

2525
# Only run in this linux based runner
2626
- name: Check Formatting

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# docker buildx build --platform linux/amd64 -t tsidp-server:amd64 --load .
77

88
# Build stage
9-
FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS builder
9+
FROM --platform=$BUILDPLATFORM golang:1.26-alpine AS builder
1010
WORKDIR /app
1111

1212
# BuildKit will set these automatically when using buildx
@@ -25,7 +25,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH:-amd64} \
2525
go build -a -installsuffix cgo -o tsidp-server .
2626

2727
# Final stage
28-
FROM --platform=$TARGETPLATFORM alpine:3.22
28+
FROM alpine:3.22
2929
RUN apk --no-cache add ca-certificates
3030
WORKDIR /app
3131

flake.nix

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,35 @@
1313
systems,
1414
}:
1515
let
16-
goVersion = "1.24.7";
17-
eachSystem = f: nixpkgs.lib.genAttrs (import systems) (s: f nixpkgs.legacyPackages.${s});
16+
goVersion = "1.26.0";
17+
goHash = "sha256-yRMqih9r0qpKrR10uCMdlSdJUEg6SVBlfubFbm6Bd5A=";
18+
eachSystem =
19+
f:
20+
nixpkgs.lib.genAttrs (import systems) (
21+
system:
22+
f (
23+
import nixpkgs {
24+
inherit system;
25+
overlays = [
26+
(final: prev: {
27+
go_1_26 = prev.go_1_26.overrideAttrs {
28+
version = goVersion;
29+
src = prev.fetchurl {
30+
url = "https://go.dev/dl/go${goVersion}.src.tar.gz";
31+
hash = goHash;
32+
};
33+
};
34+
})
35+
];
36+
}
37+
)
38+
);
1839
in
1940
{
2041
formatter = eachSystem (pkgs: pkgs.nixfmt-tree);
2142

2243
packages = eachSystem (pkgs: {
23-
tsidp = pkgs.buildGo124Module {
44+
tsidp = pkgs.buildGo126Module {
2445
pname = "tsidp";
2546
version = if (self ? shortRev) then self.shortRev else "dev";
2647
src = pkgs.nix-gitignore.gitignoreSource [ ] ./.;

go.mod

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,69 @@
11
module github.com/tailscale/tsidp
22

3-
go 1.24.13
3+
go 1.26
44

55
require (
66
filippo.io/csrf v0.2.1
77
gopkg.in/square/go-jose.v2 v2.6.0
8-
tailscale.com v1.86.5
8+
tailscale.com v1.94.2
99
)
1010

1111
require (
1212
filippo.io/edwards25519 v1.1.0 // indirect
1313
github.com/akutz/memconn v0.1.0 // indirect
1414
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
15-
github.com/aws/aws-sdk-go-v2 v1.36.0 // indirect
15+
github.com/aws/aws-sdk-go-v2 v1.41.0 // indirect
1616
github.com/aws/aws-sdk-go-v2/config v1.29.5 // indirect
1717
github.com/aws/aws-sdk-go-v2/credentials v1.17.58 // indirect
1818
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 // indirect
19-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
20-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
19+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 // indirect
20+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 // indirect
2121
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
22-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
23-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
24-
github.com/aws/aws-sdk-go-v2/service/ssm v1.44.7 // indirect
22+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
23+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect
2524
github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
2625
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
27-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.13 // indirect
28-
github.com/aws/smithy-go v1.22.2 // indirect
26+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 // indirect
27+
github.com/aws/smithy-go v1.24.0 // indirect
2928
github.com/coder/websocket v1.8.12 // indirect
30-
github.com/coreos/go-iptables v0.7.1-0.20240112124308-65c67c9f46e6 // indirect
29+
github.com/creachadair/msync v0.7.1 // indirect
3130
github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa // indirect
32-
github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e // indirect
33-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
31+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3432
github.com/gaissmai/bart v0.18.0 // indirect
35-
github.com/go-json-experiment/json v0.0.0-20250223041408-d3c622f1b874 // indirect
36-
github.com/go-ole/go-ole v1.3.0 // indirect
33+
github.com/go-json-experiment/json v0.0.0-20250813024750-ebf49471dced // indirect
3734
github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 // indirect
38-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
39-
github.com/google/btree v1.1.2 // indirect
40-
github.com/google/go-cmp v0.6.0 // indirect
41-
github.com/google/nftables v0.2.1-0.20240414091927-5e242ec57806 // indirect
35+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
36+
github.com/google/btree v1.1.3 // indirect
37+
github.com/google/go-cmp v0.7.0 // indirect
4238
github.com/google/uuid v1.6.0 // indirect
4339
github.com/hdevalence/ed25519consensus v0.2.0 // indirect
44-
github.com/illarion/gonotify/v3 v3.0.2 // indirect
45-
github.com/jmespath/go-jmespath v0.4.0 // indirect
40+
github.com/huin/goupnp v1.3.0 // indirect
4641
github.com/jsimonetti/rtnetlink v1.4.0 // indirect
47-
github.com/klauspost/compress v1.17.11 // indirect
48-
github.com/mdlayher/genetlink v1.3.2 // indirect
42+
github.com/klauspost/compress v1.18.2 // indirect
4943
github.com/mdlayher/netlink v1.7.3-0.20250113171957-fbb4dce95f42 // indirect
50-
github.com/mdlayher/sdnotify v1.0.0 // indirect
5144
github.com/mdlayher/socket v0.5.0 // indirect
52-
github.com/miekg/dns v1.1.58 // indirect
5345
github.com/mitchellh/go-ps v1.0.0 // indirect
46+
github.com/pires/go-proxyproto v0.8.1 // indirect
5447
github.com/prometheus-community/pro-bing v0.4.0 // indirect
5548
github.com/safchain/ethtool v0.3.0 // indirect
5649
github.com/tailscale/certstore v0.1.1-0.20231202035212-d3fa0460f47e // indirect
5750
github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 // indirect
58-
github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 // indirect
5951
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect
60-
github.com/tailscale/netlink v1.1.1-0.20240822203006-4d49adab4de7 // indirect
6152
github.com/tailscale/peercred v0.0.0-20250107143737-35a0c7bd7edc // indirect
6253
github.com/tailscale/web-client-prebuilt v0.0.0-20250124233751-d4cd19a26976 // indirect
6354
github.com/tailscale/wireguard-go v0.0.0-20250716170648-1d0488a3d7da // indirect
64-
github.com/vishvananda/netns v0.0.4 // indirect
6555
github.com/x448/float16 v0.8.4 // indirect
6656
go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect
6757
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
68-
golang.org/x/crypto v0.42.0 // indirect
69-
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
70-
golang.org/x/mod v0.27.0 // indirect
71-
golang.org/x/net v0.43.0 // indirect
72-
golang.org/x/sync v0.17.0 // indirect
73-
golang.org/x/sys v0.36.0 // indirect
74-
golang.org/x/term v0.35.0 // indirect
75-
golang.org/x/text v0.29.0 // indirect
76-
golang.org/x/time v0.11.0 // indirect
77-
golang.org/x/tools v0.36.0 // indirect
58+
golang.org/x/crypto v0.46.0 // indirect
59+
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
60+
golang.org/x/net v0.48.0 // indirect
61+
golang.org/x/oauth2 v0.32.0 // indirect
62+
golang.org/x/sync v0.19.0 // indirect
63+
golang.org/x/sys v0.40.0 // indirect
64+
golang.org/x/term v0.38.0 // indirect
65+
golang.org/x/text v0.32.0 // indirect
66+
golang.org/x/time v0.12.0 // indirect
7867
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
7968
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
8069
gvisor.dev/gvisor v0.0.0-20250205023644-9414b50a5633 // indirect

go.mod.sri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sha256-iBy+osK+2LdkTzXhrkSaB6nWpUCpr8VkxJTtcfVCFuw=
1+
sha256-CFiGRKlSCoPUpH63NiYBGvTUZI/Dxqkh7OsiExsNcEk=

0 commit comments

Comments
 (0)