Skip to content

Commit 1f73f05

Browse files
ThomasK33ThomasK33
committed
chore: remove custom go toolchain
Change-Id: Ic5e4198e3cb42225deea908169b91b157c398815 Signed-off-by: Thomas Kosiewski <[email protected]>
1 parent b53d914 commit 1f73f05

File tree

26 files changed

+555
-842
lines changed

26 files changed

+555
-842
lines changed

‎.github/workflows/test.yml

Lines changed: 329 additions & 303 deletions
Large diffs are not rendered by default.

‎Dockerfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# $ docker exec tailscaled tailscale status
3232

3333

34-
FROM golang:1.20-alpine AS build-env
34+
FROM golang:1.22-alpine AS build-env
3535

3636
WORKDIR /go/src/tailscale
3737

@@ -40,14 +40,14 @@ RUN go mod download
4040

4141
# Pre-build some stuff before the following COPY line invalidates the Docker cache.
4242
RUN go install \
43-
github.com/aws/aws-sdk-go-v2/aws \
44-
github.com/aws/aws-sdk-go-v2/config \
45-
gvisor.dev/gvisor/pkg/tcpip/adapters/gonet \
46-
gvisor.dev/gvisor/pkg/tcpip/stack \
47-
golang.org/x/crypto/ssh \
48-
golang.org/x/crypto/acme \
49-
github.com/coder/websocket \
50-
github.com/mdlayher/netlink
43+
github.com/aws/aws-sdk-go-v2/aws \
44+
github.com/aws/aws-sdk-go-v2/config \
45+
gvisor.dev/gvisor/pkg/tcpip/adapters/gonet \
46+
gvisor.dev/gvisor/pkg/tcpip/stack \
47+
golang.org/x/crypto/ssh \
48+
golang.org/x/crypto/acme \
49+
github.com/coder/websocket \
50+
github.com/mdlayher/netlink
5151

5252
COPY . .
5353

@@ -61,10 +61,10 @@ ENV VERSION_GIT_HASH=$VERSION_GIT_HASH
6161
ARG TARGETARCH
6262

6363
RUN GOARCH=$TARGETARCH go install -ldflags="\
64-
-X tailscale.com/version.longStamp=$VERSION_LONG \
65-
-X tailscale.com/version.shortStamp=$VERSION_SHORT \
66-
-X tailscale.com/version.gitCommitStamp=$VERSION_GIT_HASH" \
67-
-v ./cmd/tailscale ./cmd/tailscaled ./cmd/containerboot
64+
-X tailscale.com/version.longStamp=$VERSION_LONG \
65+
-X tailscale.com/version.shortStamp=$VERSION_SHORT \
66+
-X tailscale.com/version.gitCommitStamp=$VERSION_GIT_HASH" \
67+
-v ./cmd/tailscale ./cmd/tailscaled ./cmd/containerboot
6868

6969
FROM alpine:3.16
7070
RUN apk add --no-cache ca-certificates iptables iproute2 ip6tables

‎cmd/derper/depaware.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
1212
W 💣 github.com/alexbrainman/sspi/negotiate from tailscale.com/net/tshttpproxy
1313
github.com/beorn7/perks/quantile from github.com/prometheus/client_golang/prometheus
1414
💣 github.com/cespare/xxhash/v2 from github.com/prometheus/client_golang/prometheus
15+
github.com/coder/websocket from tailscale.com/cmd/derper+
16+
github.com/coder/websocket/internal/errd from github.com/coder/websocket
17+
github.com/coder/websocket/internal/util from github.com/coder/websocket
18+
github.com/coder/websocket/internal/xsync from github.com/coder/websocket
1519
L github.com/coreos/go-iptables/iptables from tailscale.com/util/linuxfw
1620
github.com/fxamacker/cbor/v2 from tailscale.com/tka
1721
github.com/golang/groupcache/lru from tailscale.com/net/dnscache
@@ -26,7 +30,6 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
2630
L github.com/josharian/native from github.com/mdlayher/netlink+
2731
L 💣 github.com/jsimonetti/rtnetlink from tailscale.com/net/interfaces+
2832
L github.com/jsimonetti/rtnetlink/internal/unix from github.com/jsimonetti/rtnetlink
29-
github.com/klauspost/compress/flate from nhooyr.io/websocket
3033
github.com/matttproud/golang_protobuf_extensions/pbutil from github.com/prometheus/common/expfmt
3134
L 💣 github.com/mdlayher/netlink from github.com/jsimonetti/rtnetlink+
3235
L 💣 github.com/mdlayher/netlink/nlenc from github.com/jsimonetti/rtnetlink+
@@ -77,9 +80,6 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
7780
google.golang.org/protobuf/runtime/protoimpl from github.com/golang/protobuf/proto+
7881
google.golang.org/protobuf/types/descriptorpb from google.golang.org/protobuf/reflect/protodesc
7982
google.golang.org/protobuf/types/known/timestamppb from github.com/prometheus/client_golang/prometheus+
80-
nhooyr.io/websocket from tailscale.com/cmd/derper+
81-
nhooyr.io/websocket/internal/errd from nhooyr.io/websocket
82-
nhooyr.io/websocket/internal/xsync from nhooyr.io/websocket
8383
tailscale.com from tailscale.com/version
8484
tailscale.com/atomicfile from tailscale.com/cmd/derper+
8585
tailscale.com/client/tailscale from tailscale.com/derp
@@ -108,7 +108,6 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
108108
tailscale.com/net/tlsdial from tailscale.com/derp/derphttp
109109
tailscale.com/net/tsaddr from tailscale.com/ipn+
110110
💣 tailscale.com/net/tshttpproxy from tailscale.com/derp/derphttp+
111-
tailscale.com/net/wsconn from tailscale.com/cmd/derper+
112111
tailscale.com/paths from tailscale.com/client/tailscale
113112
tailscale.com/safesocket from tailscale.com/client/tailscale
114113
tailscale.com/syncs from tailscale.com/cmd/derper+
@@ -193,6 +192,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
193192
golang.org/x/time/rate from tailscale.com/cmd/derper+
194193
bufio from compress/flate+
195194
bytes from bufio+
195+
cmp from net/netip+
196196
compress/flate from compress/gzip+
197197
compress/gzip from internal/profile+
198198
container/list from crypto/tls+
@@ -269,6 +269,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
269269
runtime/metrics from github.com/prometheus/client_golang/prometheus+
270270
runtime/pprof from net/http/pprof
271271
runtime/trace from net/http/pprof
272+
slices from encoding/base32+
272273
sort from compress/flate+
273274
strconv from compress/flate+
274275
strings from bufio+

‎cmd/tailscale/cli/exitnode_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func TestFilterFormatAndSortExitNodes(t *testing.T) {
135135
result := filterFormatAndSortExitNodes(ps, "")
136136

137137
if res := cmp.Diff(result.Countries, want.Countries, cmpopts.IgnoreUnexported(key.NodePublic{})); res != "" {
138-
t.Fatalf(res)
138+
t.Fatal(res)
139139
}
140140
})
141141

@@ -230,7 +230,7 @@ func TestFilterFormatAndSortExitNodes(t *testing.T) {
230230
result := filterFormatAndSortExitNodes(ps, "Pacific")
231231

232232
if res := cmp.Diff(result.Countries, want.Countries, cmpopts.IgnoreUnexported(key.NodePublic{})); res != "" {
233-
t.Fatalf(res)
233+
t.Fatal(res)
234234
}
235235
})
236236
}

‎cmd/tailscale/depaware.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
1010
W 💣 github.com/alexbrainman/sspi from github.com/alexbrainman/sspi/negotiate+
1111
W github.com/alexbrainman/sspi/internal/common from github.com/alexbrainman/sspi/negotiate
1212
W 💣 github.com/alexbrainman/sspi/negotiate from tailscale.com/net/tshttpproxy
13+
github.com/coder/websocket from tailscale.com/control/controlhttp+
14+
github.com/coder/websocket/internal/errd from github.com/coder/websocket
15+
github.com/coder/websocket/internal/util from github.com/coder/websocket
16+
github.com/coder/websocket/internal/xsync from github.com/coder/websocket
1317
L github.com/coreos/go-iptables/iptables from tailscale.com/util/linuxfw
1418
W 💣 github.com/dblohm7/wingoes from tailscale.com/util/winutil/authenticode
1519
W 💣 github.com/dblohm7/wingoes/pe from tailscale.com/util/winutil/authenticode
@@ -27,7 +31,6 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
2731
L 💣 github.com/jsimonetti/rtnetlink from tailscale.com/net/interfaces+
2832
L github.com/jsimonetti/rtnetlink/internal/unix from github.com/jsimonetti/rtnetlink
2933
github.com/kballard/go-shellquote from tailscale.com/cmd/tailscale/cli
30-
github.com/klauspost/compress/flate from nhooyr.io/websocket
3134
💣 github.com/mattn/go-colorable from tailscale.com/cmd/tailscale/cli
3235
💣 github.com/mattn/go-isatty from github.com/mattn/go-colorable+
3336
L 💣 github.com/mdlayher/netlink from github.com/jsimonetti/rtnetlink+
@@ -58,9 +61,6 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
5861
W 💣 golang.zx2c4.com/wireguard/windows/tunnel/winipcfg from tailscale.com/net/interfaces+
5962
gopkg.in/yaml.v2 from sigs.k8s.io/yaml
6063
k8s.io/client-go/util/homedir from tailscale.com/cmd/tailscale/cli
61-
nhooyr.io/websocket from tailscale.com/derp/derphttp+
62-
nhooyr.io/websocket/internal/errd from nhooyr.io/websocket
63-
nhooyr.io/websocket/internal/xsync from nhooyr.io/websocket
6464
sigs.k8s.io/yaml from tailscale.com/cmd/tailscale/cli
6565
software.sslmate.com/src/go-pkcs12 from tailscale.com/cmd/tailscale/cli
6666
software.sslmate.com/src/go-pkcs12/internal/rc2 from software.sslmate.com/src/go-pkcs12
@@ -103,7 +103,6 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
103103
tailscale.com/net/tlsdial from tailscale.com/derp/derphttp+
104104
tailscale.com/net/tsaddr from tailscale.com/net/interfaces+
105105
💣 tailscale.com/net/tshttpproxy from tailscale.com/derp/derphttp+
106-
tailscale.com/net/wsconn from tailscale.com/control/controlhttp+
107106
tailscale.com/paths from tailscale.com/cmd/tailscale/cli+
108107
tailscale.com/safesocket from tailscale.com/cmd/tailscale/cli+
109108
tailscale.com/syncs from tailscale.com/net/netcheck+
@@ -195,6 +194,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
195194
golang.org/x/time/rate from tailscale.com/cmd/tailscale/cli+
196195
bufio from compress/flate+
197196
bytes from bufio+
197+
cmp from net/netip+
198198
compress/flate from compress/gzip+
199199
compress/gzip from net/http
200200
compress/zlib from image/png+
@@ -249,7 +249,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
249249
image/png from github.com/skip2/go-qrcode
250250
io from bufio+
251251
io/fs from crypto/x509+
252-
io/ioutil from golang.org/x/sys/cpu+
252+
io/ioutil from github.com/mitchellh/go-ps+
253253
log from expvar+
254254
log/internal from log
255255
math from compress/flate+
@@ -278,6 +278,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
278278
regexp from github.com/tailscale/goupnp/httpu+
279279
regexp/syntax from regexp
280280
runtime/debug from tailscale.com/util/singleflight+
281+
slices from encoding/base32+
281282
sort from compress/flate+
282283
strconv from compress/flate+
283284
strings from bufio+

0 commit comments

Comments
 (0)