Skip to content

Commit 4760ed8

Browse files
feat(ci): Bump to upstream 1.90.3 (#28)
The changelog has not been published yet for 1.90.3, but https://tailscale.com/changelog#2025-10-24 This takes this repo from 1.88.1 > 1.90.3
2 parents 8e1eff8 + bbc48e7 commit 4760ed8

707 files changed

Lines changed: 27499 additions & 13648 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ALPINE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.19
1+
3.22

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ RUN GOARCH=$TARGETARCH go install -ldflags="\
7171
-X tailscale.com/version.gitCommitStamp=$VERSION_GIT_HASH" \
7272
-v ./cmd/tailscale ./cmd/tailscaled ./cmd/containerboot
7373

74-
FROM alpine:3.19
74+
FROM alpine:3.22
7575
RUN apk add --no-cache ca-certificates iptables iproute2 ip6tables
76-
RUN rm /sbin/iptables && ln -s /sbin/iptables-legacy /sbin/iptables
77-
RUN rm /sbin/ip6tables && ln -s /sbin/ip6tables-legacy /sbin/ip6tables
76+
RUN ln -s /sbin/iptables-legacy /sbin/iptables
77+
RUN ln -s /sbin/ip6tables-legacy /sbin/ip6tables
7878

7979
COPY --from=build-env /go/bin/* /usr/local/bin/
8080
# For compat with the previous run.sh, although ideally you should be

Dockerfile.base

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Copyright (c) Tailscale Inc & AUTHORS
22
# SPDX-License-Identifier: BSD-3-Clause
33

4-
FROM alpine:3.19
4+
FROM alpine:3.22
55
RUN apk add --no-cache ca-certificates iptables iptables-legacy iproute2 ip6tables iputils
6-
# Alpine 3.19 replaces legacy iptables with nftables based implementation. We
6+
# Alpine 3.19 replaced legacy iptables with nftables based implementation. We
77
# can't be certain that all hosts that run Tailscale containers currently
88
# suppport nftables, so link back to legacy for backwards compatibility reasons.
99
# TODO(irbekrm): add some way how to determine if we still run on nodes that
1010
# don't support nftables, so that we can eventually remove these symlinks.
11-
RUN rm /sbin/iptables && ln -s /sbin/iptables-legacy /sbin/iptables
12-
RUN rm /sbin/ip6tables && ln -s /sbin/ip6tables-legacy /sbin/ip6tables
11+
RUN ln -s /sbin/iptables-legacy /sbin/iptables
12+
RUN ln -s /sbin/ip6tables-legacy /sbin/ip6tables

Makefile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,36 @@ lint: ## Run golangci-lint
1818
updatedeps: ## Update depaware deps
1919
# depaware (via x/tools/go/packages) shells back to "go", so make sure the "go"
2020
# it finds in its $$PATH is the right one.
21-
PATH="$$(./tool/go env GOROOT)/bin:$$PATH" ./tool/go run github.com/tailscale/depaware --update --internal \
21+
PATH="$$(./tool/go env GOROOT)/bin:$$PATH" ./tool/go run github.com/tailscale/depaware --update --vendor --internal \
2222
tailscale.com/cmd/tailscaled \
2323
tailscale.com/cmd/tailscale \
2424
tailscale.com/cmd/derper \
2525
tailscale.com/cmd/k8s-operator \
2626
tailscale.com/cmd/stund \
2727
tailscale.com/cmd/tsidp
28-
PATH="$$(./tool/go env GOROOT)/bin:$$PATH" ./tool/go run github.com/tailscale/depaware --update -goos=linux,darwin,windows,android,ios --internal \
28+
PATH="$$(./tool/go env GOROOT)/bin:$$PATH" ./tool/go run github.com/tailscale/depaware --update --goos=linux,darwin,windows,android,ios --vendor --internal \
2929
tailscale.com/tsnet
30+
PATH="$$(./tool/go env GOROOT)/bin:$$PATH" ./tool/go run github.com/tailscale/depaware --update --file=depaware-minbox.txt --goos=linux --tags="$$(./tool/go run ./cmd/featuretags --min --add=cli)" --vendor --internal \
31+
tailscale.com/cmd/tailscaled
32+
PATH="$$(./tool/go env GOROOT)/bin:$$PATH" ./tool/go run github.com/tailscale/depaware --update --file=depaware-min.txt --goos=linux --tags="$$(./tool/go run ./cmd/featuretags --min)" --vendor --internal \
33+
tailscale.com/cmd/tailscaled
3034

3135
depaware: ## Run depaware checks
3236
# depaware (via x/tools/go/packages) shells back to "go", so make sure the "go"
3337
# it finds in its $$PATH is the right one.
34-
PATH="$$(./tool/go env GOROOT)/bin:$$PATH" ./tool/go run github.com/tailscale/depaware --check --internal \
38+
PATH="$$(./tool/go env GOROOT)/bin:$$PATH" ./tool/go run github.com/tailscale/depaware --check --vendor --internal \
3539
tailscale.com/cmd/tailscaled \
3640
tailscale.com/cmd/tailscale \
3741
tailscale.com/cmd/derper \
3842
tailscale.com/cmd/k8s-operator \
3943
tailscale.com/cmd/stund \
4044
tailscale.com/cmd/tsidp
41-
PATH="$$(./tool/go env GOROOT)/bin:$$PATH" ./tool/go run github.com/tailscale/depaware --check --goos=linux,darwin,windows,android,ios --internal \
45+
PATH="$$(./tool/go env GOROOT)/bin:$$PATH" ./tool/go run github.com/tailscale/depaware --check --goos=linux,darwin,windows,android,ios --vendor --internal \
4246
tailscale.com/tsnet
47+
PATH="$$(./tool/go env GOROOT)/bin:$$PATH" ./tool/go run github.com/tailscale/depaware --check --file=depaware-minbox.txt --goos=linux --tags="$$(./tool/go run ./cmd/featuretags --min --add=cli)" --vendor --internal \
48+
tailscale.com/cmd/tailscaled
49+
PATH="$$(./tool/go env GOROOT)/bin:$$PATH" ./tool/go run github.com/tailscale/depaware --check --file=depaware-min.txt --goos=linux --tags="$$(./tool/go run ./cmd/featuretags --min)" --vendor --internal \
50+
tailscale.com/cmd/tailscaled
4351

4452
buildwindows: ## Build tailscale CLI for windows/amd64
4553
GOOS=windows GOARCH=amd64 ./tool/go install tailscale.com/cmd/tailscale tailscale.com/cmd/tailscaled

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ not open source.
3737

3838
## Building
3939

40-
We always require the latest Go release, currently Go 1.23. (While we build
40+
We always require the latest Go release, currently Go 1.25. (While we build
4141
releases with our [Go fork](https://github.com/tailscale/go/), its use is not
4242
required.)
4343

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.88.1
1+
1.90.3

0 commit comments

Comments
 (0)