Skip to content

Commit 84e6aa3

Browse files
ethanndicksonethanndickson
authored
fix: update dockerfile to fix test (#84)
This gets tests we care about passing again, as Dean requested. It also comments out the arches we dont care about, and runs `go mod tidy`. I gave up on fixing depaware (there's some local <-> ci desync) as it doesn't seem particularly useful for us, it's not like we use it on coder/coder. In any case, the coder/coder tests are the ones we really need to care about.
1 parent 3a0bb93 commit 84e6aa3

File tree

7 files changed

+58
-37
lines changed

7 files changed

+58
-37
lines changed

‎.github/workflows/test.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,13 @@ jobs:
179179
# tested more exhaustively in the 'test' job above.
180180
- goos: linux
181181
goarch: arm64
182-
- goos: linux
183-
goarch: "386" # thanks yaml
184-
- goos: linux
185-
goarch: loong64
186-
- goos: linux
187-
goarch: arm
188-
goarm: "5"
182+
# - goos: linux
183+
# goarch: "386" # thanks yaml
184+
# - goos: linux
185+
# goarch: loong64
186+
# - goos: linux
187+
# goarch: arm
188+
# goarm: "5"
189189
- goos: linux
190190
goarch: arm
191191
goarm: "7"
@@ -199,11 +199,11 @@ jobs:
199199
goarch: amd64
200200
- goos: windows
201201
goarch: arm64
202-
# BSDs
203-
- goos: freebsd
204-
goarch: amd64
205-
- goos: openbsd
206-
goarch: amd64
202+
# # BSDs
203+
# - goos: freebsd
204+
# goarch: amd64
205+
# - goos: openbsd
206+
# goarch: amd64
207207

208208
runs-on: ubuntu-22.04
209209
steps:
@@ -452,7 +452,7 @@ jobs:
452452
{
453453
"attachments": [{
454454
"title": "Failure: ${{ github.workflow }}",
455-
"title_link": "https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks",
455+
"title_link": "https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks",
456456
"text": "${{ github.repository }}@${{ github.ref_name }}: <https://github.com/${{ github.repository }}/commit/${{ github.sha }}|${{ github.sha }}>",
457457
"fields": [{ "value": ${{ toJson(github.event.head_commit.message) }}, "short": false }],
458458
"footer": "${{ github.event.head_commit.committer.name }} at ${{ github.event.head_commit.timestamp }}",

‎Dockerfile‎

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

3333

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

3636
WORKDIR /go/src/tailscale
3737

‎cmd/derper/depaware.txt‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
5757
google.golang.org/protobuf/internal/descfmt from google.golang.org/protobuf/internal/filedesc
5858
google.golang.org/protobuf/internal/descopts from google.golang.org/protobuf/internal/filedesc+
5959
google.golang.org/protobuf/internal/detrand from google.golang.org/protobuf/internal/descfmt+
60+
google.golang.org/protobuf/internal/editiondefaults from google.golang.org/protobuf/internal/filedesc+
6061
google.golang.org/protobuf/internal/encoding/defval from google.golang.org/protobuf/internal/encoding/tag+
6162
google.golang.org/protobuf/internal/encoding/messageset from google.golang.org/protobuf/encoding/prototext+
6263
google.golang.org/protobuf/internal/encoding/tag from google.golang.org/protobuf/internal/impl
@@ -78,7 +79,8 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
7879
google.golang.org/protobuf/reflect/protoregistry from github.com/golang/protobuf/proto+
7980
google.golang.org/protobuf/runtime/protoiface from github.com/golang/protobuf/proto+
8081
google.golang.org/protobuf/runtime/protoimpl from github.com/golang/protobuf/proto+
81-
google.golang.org/protobuf/types/descriptorpb from google.golang.org/protobuf/reflect/protodesc
82+
google.golang.org/protobuf/types/descriptorpb from google.golang.org/protobuf/reflect/protodesc+
83+
google.golang.org/protobuf/types/gofeaturespb from google.golang.org/protobuf/reflect/protodesc
8284
google.golang.org/protobuf/types/known/timestamppb from github.com/prometheus/client_golang/prometheus+
8385
tailscale.com from tailscale.com/version
8486
tailscale.com/atomicfile from tailscale.com/cmd/derper+
@@ -159,11 +161,10 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
159161
golang.org/x/crypto/blake2b from golang.org/x/crypto/nacl/box+
160162
golang.org/x/crypto/blake2s from tailscale.com/tka
161163
golang.org/x/crypto/chacha20 from golang.org/x/crypto/chacha20poly1305
162-
golang.org/x/crypto/chacha20poly1305 from crypto/tls
164+
golang.org/x/crypto/chacha20poly1305 from crypto/tls+
163165
golang.org/x/crypto/cryptobyte from crypto/ecdsa+
164166
golang.org/x/crypto/cryptobyte/asn1 from crypto/ecdsa+
165167
golang.org/x/crypto/curve25519 from golang.org/x/crypto/nacl/box+
166-
golang.org/x/crypto/hkdf from crypto/tls
167168
golang.org/x/crypto/nacl/box from tailscale.com/types/key
168169
golang.org/x/crypto/nacl/secretbox from golang.org/x/crypto/nacl/box
169170
golang.org/x/crypto/salsa20/salsa from golang.org/x/crypto/nacl/box+
@@ -198,7 +199,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
198199
container/list from crypto/tls+
199200
context from crypto/tls+
200201
crypto from crypto/ecdsa+
201-
crypto/aes from crypto/ecdsa+
202+
crypto/aes from crypto/internal/hpke+
202203
crypto/cipher from crypto/aes+
203204
crypto/des from crypto/tls+
204205
crypto/dsa from crypto/x509
@@ -213,12 +214,13 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
213214
crypto/rsa from crypto/tls+
214215
crypto/sha1 from crypto/tls+
215216
crypto/sha256 from crypto/tls+
217+
crypto/sha3 from crypto/internal/fips140hash
216218
crypto/sha512 from crypto/ecdsa+
217-
crypto/subtle from crypto/aes+
219+
crypto/subtle from crypto/cipher+
218220
crypto/tls from golang.org/x/crypto/acme+
219221
crypto/x509 from crypto/tls+
220222
crypto/x509/pkix from crypto/x509+
221-
embed from crypto/internal/nistec+
223+
embed from google.golang.org/protobuf/internal/editiondefaults+
222224
encoding from encoding/json+
223225
encoding/asn1 from crypto/x509+
224226
encoding/base32 from tailscale.com/tka
@@ -240,12 +242,15 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
240242
io from bufio+
241243
io/fs from crypto/x509+
242244
io/ioutil from github.com/mitchellh/go-ps+
245+
iter from bytes+
243246
log from expvar+
244247
log/internal from log
248+
maps from crypto/x509+
245249
math from compress/flate+
246250
math/big from crypto/dsa+
247251
math/bits from compress/flate+
248252
math/rand from github.com/mdlayher/netlink+
253+
math/rand/v2 from crypto/ecdsa+
249254
mime from mime/multipart+
250255
mime/multipart from net/http
251256
mime/quotedprintable from mime/multipart
@@ -257,7 +262,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
257262
net/netip from go4.org/netipx+
258263
net/textproto from golang.org/x/net/http/httpguts+
259264
net/url from crypto/x509+
260-
os from crypto/rand+
265+
os from crypto/internal/sysrand+
261266
os/exec from golang.zx2c4.com/wireguard/windows/tunnel/winipcfg+
262267
W os/user from tailscale.com/util/winutil
263268
path from golang.org/x/crypto/acme/autocert+
@@ -275,9 +280,11 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
275280
strings from bufio+
276281
sync from compress/flate+
277282
sync/atomic from context+
278-
syscall from crypto/rand+
283+
syscall from crypto/internal/sysrand+
279284
text/tabwriter from runtime/pprof
280285
time from compress/gzip+
281286
unicode from bytes+
282287
unicode/utf16 from crypto/x509+
283288
unicode/utf8 from bufio+
289+
unique from net/netip
290+
weak from unique

‎cmd/tailscale/depaware.txt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
158158
golang.org/x/crypto/cryptobyte from crypto/ecdsa+
159159
golang.org/x/crypto/cryptobyte/asn1 from crypto/ecdsa+
160160
golang.org/x/crypto/curve25519 from golang.org/x/crypto/nacl/box+
161-
golang.org/x/crypto/hkdf from crypto/tls+
161+
golang.org/x/crypto/hkdf from tailscale.com/control/controlbase
162162
golang.org/x/crypto/nacl/box from tailscale.com/types/key
163163
golang.org/x/crypto/nacl/secretbox from golang.org/x/crypto/nacl/box
164164
golang.org/x/crypto/pbkdf2 from software.sslmate.com/src/go-pkcs12
@@ -201,7 +201,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
201201
container/list from crypto/tls+
202202
context from crypto/tls+
203203
crypto from crypto/ecdsa+
204-
crypto/aes from crypto/ecdsa+
204+
crypto/aes from crypto/internal/hpke+
205205
crypto/cipher from crypto/aes+
206206
crypto/des from crypto/tls+
207207
crypto/dsa from crypto/x509
@@ -216,8 +216,9 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
216216
crypto/rsa from crypto/tls+
217217
crypto/sha1 from crypto/tls+
218218
crypto/sha256 from crypto/tls+
219+
crypto/sha3 from crypto/internal/fips140hash
219220
crypto/sha512 from crypto/ecdsa+
220-
crypto/subtle from crypto/aes+
221+
crypto/subtle from crypto/cipher+
221222
crypto/tls from github.com/tcnksm/go-httpstat+
222223
crypto/x509 from crypto/tls+
223224
crypto/x509/pkix from crypto/x509+
@@ -250,12 +251,15 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
250251
io from bufio+
251252
io/fs from crypto/x509+
252253
io/ioutil from github.com/mitchellh/go-ps+
254+
iter from maps+
253255
log from expvar+
254256
log/internal from log
257+
maps from net/http+
255258
math from compress/flate+
256259
math/big from crypto/dsa+
257260
math/bits from compress/flate+
258261
math/rand from math/big+
262+
math/rand/v2 from crypto/ecdsa+
259263
mime from mime/multipart+
260264
mime/multipart from net/http
261265
mime/quotedprintable from mime/multipart
@@ -268,7 +272,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
268272
net/netip from net+
269273
net/textproto from golang.org/x/net/http/httpguts+
270274
net/url from crypto/x509+
271-
os from crypto/rand+
275+
os from crypto/internal/sysrand+
272276
os/exec from github.com/toqueteos/webbrowser+
273277
os/signal from tailscale.com/cmd/tailscale/cli
274278
os/user from tailscale.com/util/groupmember+
@@ -284,11 +288,13 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
284288
strings from bufio+
285289
sync from compress/flate+
286290
sync/atomic from context+
287-
syscall from crypto/rand+
291+
syscall from crypto/internal/sysrand+
288292
text/tabwriter from github.com/peterbourgon/ff/v3/ffcli+
289293
text/template from html/template
290294
text/template/parse from html/template+
291295
time from compress/gzip+
292296
unicode from bytes+
293297
unicode/utf16 from encoding/asn1+
294298
unicode/utf8 from bufio+
299+
unique from net/netip
300+
weak from unique

0 commit comments

Comments
 (0)