myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Merge branch 'embedded-derp' of https://github.com/juanfont/headscale into embedded-derp

Browse source
This commit is contained in:
Juan Font Alonso 2022-03-06 23:47:31 +01:00
commit 15ed71315c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile.tailscale
View file

@ -13,4 +13,4 @@ RUN apt-get update \
ADD integration_test/etc_embedded_derp/tls/server.crt /usr/local/share/ca-certificates/ ADD integration_test/etc_embedded_derp/tls/server.crt /usr/local/share/ca-certificates/
RUN chmod 644 /usr/local/share/ca-certificates/server.crt RUN chmod 644 /usr/local/share/ca-certificates/server.crt
RUN update-ca-certificates RUN update-ca-certificates

2
integration_common_test.go
View file

@ -20,7 +20,7 @@ var (
IpPrefix4 = netaddr.MustParseIPPrefix("100.64.0.0/10") IpPrefix4 = netaddr.MustParseIPPrefix("100.64.0.0/10")
IpPrefix6 = netaddr.MustParseIPPrefix("fd7a:115c:a1e0::/48") IpPrefix6 = netaddr.MustParseIPPrefix("fd7a:115c:a1e0::/48")
tailscaleVersions = []string{"1.20.4", "1.18.2", "1.16.2", "1.14.3", "1.12.3"} tailscaleVersions = []string{"1.22.0", "1.20.4", "1.18.2", "1.16.2", "1.14.3", "1.12.3"}
) )
type TestNamespace struct { type TestNamespace struct {