Skip to content

Commit 1f9fe17

Browse files
willnorriswillnorris
committed
go.mod: bump to tailscale 1.52.0
Technically, this is one commit before the 1.52.0 tag to keep it a pseudo-version. Signed-off-by: Will Norris <[email protected]>
1 parent 3d62a35 commit 1f9fe17

File tree

5 files changed

+235
-269
lines changed

5 files changed

+235
-269
lines changed

‎Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM --platform=$BUILDPLATFORM cgr.dev/chainguard/wolfi-base as build
2-
RUN apk update && apk add build-base git openssh go-1.20
2+
RUN apk update && apk add build-base git openssh go-1.21
33

44
WORKDIR /work
55

@@ -9,10 +9,10 @@ RUN go mod download
99
COPY . .
1010
ARG TARGETOS TARGETARCH TARGETVARIANT
1111
RUN \
12-
if [ "${TARGETARCH}" = "arm" ] && [ -n "${TARGETVARIANT}" ]; then \
13-
export GOARM="${TARGETVARIANT#v}"; \
14-
fi; \
15-
GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -v ./cmd/golink
12+
if [ "${TARGETARCH}" = "arm" ] && [ -n "${TARGETVARIANT}" ]; then \
13+
export GOARM="${TARGETVARIANT#v}"; \
14+
fi; \
15+
GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -v ./cmd/golink
1616

1717

1818
FROM cgr.dev/chainguard/static:latest

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
pkgs = nixpkgs.legacyPackages.${prev.system};
2525
in
2626
rec {
27-
golink = pkgs.buildGo120Module rec {
27+
golink = pkgs.buildGo121Module rec {
2828
pname = "golink";
2929
version = golinkVersion;
3030
src = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
3131

32-
vendorSha256 = "sha256-TS3L/Pil3Vww/G3f8P/4wKwnwAKsTPPisiXukCbci6I="; # SHA based on vendoring go.mod
32+
vendorSha256 = "sha256-+DC7ybg+2hBdhX7SyAA2zUTCJlUXQwxzT1CjLf3drv4="; # SHA based on vendoring go.mod
3333
};
3434
};
3535
}
@@ -43,7 +43,7 @@
4343
in
4444
rec {
4545
# `nix develop`
46-
devShell = pkgs.mkShell { buildInputs = [ pkgs.go_1_20 ]; };
46+
devShell = pkgs.mkShell { buildInputs = [ pkgs.go_1_21 ]; };
4747

4848
# `nix build`
4949
packages = with pkgs; {

‎go.mod

Lines changed: 58 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,88 @@
11
module github.com/tailscale/golink
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/google/go-cmp v0.5.9
7+
golang.org/x/net v0.17.0
78
modernc.org/sqlite v1.19.4
89
// Always use a pseudo-version for the tailscale.com module, or else
910
// go's version selection causes problems when pulling golink into corp.
10-
tailscale.com v1.1.1-0.20230501211016-c5bf868940d8
11+
tailscale.com v1.1.1-0.20231028164453-62d580f0e8b6
1112
)
1213

1314
require (
14-
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
15-
github.com/Microsoft/go-winio v0.6.0 // indirect
15+
filippo.io/edwards25519 v1.0.0 // indirect
1616
github.com/akutz/memconn v0.1.0 // indirect
17-
github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 // indirect
18-
github.com/aws/aws-sdk-go-v2 v1.17.3 // indirect
19-
github.com/aws/aws-sdk-go-v2/config v1.11.0 // indirect
20-
github.com/aws/aws-sdk-go-v2/credentials v1.6.4 // indirect
21-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.8.2 // indirect
22-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect
23-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect
24-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.2 // indirect
25-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.2 // indirect
26-
github.com/aws/aws-sdk-go-v2/service/ssm v1.35.0 // indirect
27-
github.com/aws/aws-sdk-go-v2/service/sso v1.6.2 // indirect
28-
github.com/aws/aws-sdk-go-v2/service/sts v1.11.1 // indirect
29-
github.com/aws/smithy-go v1.13.5 // indirect
30-
github.com/coreos/go-iptables v0.6.0 // indirect
31-
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
32-
github.com/go-ole/go-ole v1.2.6 // indirect
33-
github.com/godbus/dbus/v5 v5.0.6 // indirect
17+
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
18+
github.com/aws/aws-sdk-go-v2 v1.21.0 // indirect
19+
github.com/aws/aws-sdk-go-v2/config v1.18.42 // indirect
20+
github.com/aws/aws-sdk-go-v2/credentials v1.13.40 // indirect
21+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect
22+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect
23+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect
24+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 // indirect
25+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect
26+
github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect
27+
github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 // indirect
28+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 // indirect
29+
github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 // indirect
30+
github.com/aws/smithy-go v1.14.2 // indirect
31+
github.com/coreos/go-iptables v0.7.0 // indirect
32+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
33+
github.com/dblohm7/wingoes v0.0.0-20230929194252-e994401fc077 // indirect
34+
github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e // indirect
35+
github.com/fxamacker/cbor/v2 v2.5.0 // indirect
36+
github.com/go-ole/go-ole v1.3.0 // indirect
37+
github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 // indirect
3438
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
35-
github.com/google/btree v1.0.1 // indirect
36-
github.com/google/uuid v1.3.0 // indirect
37-
github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect
39+
github.com/google/btree v1.1.2 // indirect
40+
github.com/google/nftables v0.1.1-0.20230115205135-9aa6fdf5a28c // indirect
41+
github.com/google/uuid v1.3.1 // indirect
42+
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
3843
github.com/illarion/gonotify v1.0.1 // indirect
39-
github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 // indirect
44+
github.com/insomniacslk/dhcp v0.0.0-20230908212754-65c27093e38a // indirect
4045
github.com/jmespath/go-jmespath v0.4.0 // indirect
4146
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 // indirect
42-
github.com/jsimonetti/rtnetlink v1.1.2-0.20220408201609-d380b505068b // indirect
47+
github.com/jsimonetti/rtnetlink v1.3.5 // indirect
4348
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
44-
github.com/klauspost/compress v1.15.4 // indirect
49+
github.com/klauspost/compress v1.17.0 // indirect
4550
github.com/kortschak/wol v0.0.0-20200729010619-da482cc4850a // indirect
46-
github.com/mattn/go-isatty v0.0.17 // indirect
47-
github.com/mdlayher/genetlink v1.2.0 // indirect
48-
github.com/mdlayher/netlink v1.7.1 // indirect
51+
github.com/mattn/go-isatty v0.0.19 // indirect
52+
github.com/mdlayher/genetlink v1.3.2 // indirect
53+
github.com/mdlayher/netlink v1.7.2 // indirect
4954
github.com/mdlayher/sdnotify v1.0.0 // indirect
50-
github.com/mdlayher/socket v0.4.0 // indirect
55+
github.com/mdlayher/socket v0.5.0 // indirect
56+
github.com/miekg/dns v1.1.56 // indirect
5157
github.com/mitchellh/go-ps v1.0.0 // indirect
52-
github.com/pkg/errors v0.9.1 // indirect
58+
github.com/pierrec/lz4/v4 v4.1.18 // indirect
5359
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
54-
github.com/tailscale/certstore v0.1.1-0.20220316223106-78d6e1c49d8d // indirect
55-
github.com/tailscale/golang-x-crypto v0.0.0-20221102133106-bc99ab8c2d17 // indirect
60+
github.com/tailscale/certstore v0.1.1-0.20231020161753-77811a65f4ff // indirect
61+
github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 // indirect
62+
github.com/tailscale/golang-x-crypto v0.0.0-20230713185742-f0b76a10a08e // indirect
5663
github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 // indirect
64+
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect
5765
github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 // indirect
58-
github.com/tailscale/wireguard-go v0.0.0-20230410165232-af172621b4dd // indirect
66+
github.com/tailscale/wireguard-go v0.0.0-20230929223258-2f6748dc88e7 // indirect
5967
github.com/tcnksm/go-httpstat v0.2.0 // indirect
60-
github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
61-
github.com/vishvananda/netlink v1.1.1-0.20211118161826-650dca95af54 // indirect
62-
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
68+
github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 // indirect
69+
github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
70+
github.com/vishvananda/netns v0.0.4 // indirect
6371
github.com/x448/float16 v0.8.4 // indirect
64-
go4.org/mem v0.0.0-20210711025021-927187094b94 // indirect
65-
go4.org/netipx v0.0.0-20220725152314-7e7bdc8411bf // indirect
66-
golang.org/x/crypto v0.6.0 // indirect
67-
golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
68-
golang.org/x/mod v0.9.0 // indirect
69-
golang.org/x/net v0.8.0 // indirect
70-
golang.org/x/sync v0.1.0 // indirect
71-
golang.org/x/sys v0.6.0 // indirect
72-
golang.org/x/term v0.6.0 // indirect
73-
golang.org/x/text v0.8.0 // indirect
74-
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
75-
golang.org/x/tools v0.7.0 // indirect
72+
go4.org/mem v0.0.0-20220726221520-4f986261bf13 // indirect
73+
go4.org/netipx v0.0.0-20230824141953-6213f710f925 // indirect
74+
golang.org/x/crypto v0.14.0 // indirect
75+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
76+
golang.org/x/mod v0.12.0 // indirect
77+
golang.org/x/sync v0.3.0 // indirect
78+
golang.org/x/sys v0.13.0 // indirect
79+
golang.org/x/term v0.13.0 // indirect
80+
golang.org/x/text v0.13.0 // indirect
81+
golang.org/x/time v0.3.0 // indirect
82+
golang.org/x/tools v0.13.0 // indirect
7683
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
7784
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
78-
gvisor.dev/gvisor v0.0.0-20230328175328-162ed5ef888d // indirect
85+
gvisor.dev/gvisor v0.0.0-20230928000133-4fe30062272c // indirect
7986
inet.af/peercred v0.0.0-20210906144145-0893ea02156a // indirect
8087
lukechampine.com/uint128 v1.2.0 // indirect
8188
modernc.org/cc/v3 v3.40.0 // indirect

0 commit comments

Comments
 (0)