use upstream tailscale containers, not our own

Signed-off-by: Kristoffer Dalby <[email protected]>
kradalby · Aug 29, 2023 · bf7ff79 · bf7ff79
1 parent 037f3bf
commit bf7ff79
Show file tree

Hide file tree

Showing 5 changed files with 191 additions and 273 deletions.
diff --git a/Dockerfile.tailscale b/Dockerfile.tailscale
diff --git a/integration/acl_test.go b/integration/acl_test.go
@@ -58,9 +58,9 @@ func aclScenario(t *testing.T, policy *policy.ACLPolicy, clientsPerUser int) *Sc
  err = scenario.CreateHeadscaleEnv(spec,
  []tsic.Option{
  tsic.WithDockerEntrypoint([]string{
- "/bin/bash",
+ "/bin/sh",
  "-c",
- "/bin/sleep 3 ; update-ca-certificates ; python3 -m http.server --bind :: 80 & tailscaled --tun=tsdev",
+ "/bin/sleep 3 ; apk add python3 curl ; update-ca-certificates ; python3 -m http.server --bind :: 80 & tailscaled --tun=tsdev",
  }),
  tsic.WithDockerWorkdir("/"),
  },

diff --git a/integration/scenario.go b/integration/scenario.go
@@ -34,33 +34,34 @@ var (
  tailscaleVersions2021 = []string{
  "head",
  "unstable",
- "1.46.1",
- "1.44.2",
- "1.42.0",
- "1.40.0",
- "1.38.4",
- "1.36.2",
- "1.34.2",
- "1.32.3",
- "1.30.2",
+ "1.48",
+ "1.46",
+ "1.44",
+ "1.42",
+ "1.40",
+ "1.38",
+ "1.36",
+ "1.34",
+ "1.32",
+ "1.30",
  }
 
  tailscaleVersions2019 = []string{
- "1.28.0",
- "1.26.2",
- "1.24.2",
- "1.22.2",
- "1.20.4",
+ "1.28",
+ "1.26",
+ "1.24",
+ "1.22",
+ "1.20",
+ "1.18",
+ "1.16",
  }
 
  // tailscaleVersionsUnavailable = []string{
  // // These versions seem to fail when fetching from apt.
- // "1.18.2",
- // "1.16.2",
- // "1.14.6",
- // "1.12.4",
- // "1.10.2",
- // "1.8.7",
+ // "1.14.6",
+ // "1.12.4",
+ // "1.10.2",
+ // "1.8.7",
  // }.
 
  // TailscaleVersions represents a list of Tailscale versions the suite