Commit Graph

20 Commits (main)

Author SHA1 Message Date
kari-ts 915e4e3394
Dockerfile: update to use go 1.22 (#163)
Updates #cleanup
3 months ago
Maisem Ali 50b5b851eb
go.mod: bump oss (#130)
Updates #oss

Signed-off-by: Maisem Ali <maisem@tailscale.com>
8 months ago
James Tucker 11a0d21d2e android: upgrade gradle plugin runtime to 8.1
Another upgrade recommended by Android Studio, again this is just
upgrading the build tooling, and not yet changing any of the runtime
side dependencies or behaviors.

We switch from jcenter to mavenCentral as advised in the build output,
as jcenter has shutdown.

This includes a mandatory JDK bump from 11 to 20.

Updates #cleanup
9 months ago
James Tucker 926613ddae
Makefile,Dockerfile,README.md: improve build dependency setup and documentation (#114)
- Teach Makefile to install an Android SDK and the components we need
- Make Dockerfile delegate to Makefile for Android SDK setup
- Detect Android Studio and other known SDK paths, and use them if found.
- Update documentation to more consistently point to Android Studio & make.
- Add a task that checks for the SDK components and produces a useful error.
- Build an APK by default.
- Allow TOOLCHAINDIR to be passed in, and strip the first go/ component
  so that it is the path a user would expect.

Updates #cleanup
9 months ago
Will Norris dc9c96278d Dockerfile: update build tools in dockerfile
Use a slightly more current version of Java (jdk-11), as well as more
recent versions of Android build tools and Go.

Fixes tailscale/tailscale#8404

Signed-off-by: Will Norris <will@tailscale.com>
11 months ago
Spencer Comfort 2a5ced8159
Dockerfile: go 1.19.5 (#77)
Updates go from 1.17.5 to 1.19.5 in the dockerfile
1 year ago
Elias Naur b803576542 android,Dockerfile: bump NDK, Gradle
Nix support is easier to do with recent NDK and Gradle dependencies.
Bump them here, and add Nix support in a follow-up.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
2 years ago
Elias Naur 7c268dfc4f Revert "Revert "cmd/tailscale,go.*: update Gio version""
This reverts commit 213009e9af, and
updates Gio to a version that includes directional focus support.

For tailscale/tailscale#1611

Signed-off-by: Elias Naur <mail@eliasnaur.com>
2 years ago
Brad Fitzpatrick 19822d0b94 go.mod: use Go toolchain rev from oss
And don't sha1-sum the Go toolchain cache.
Just see if its go binary works.

Updates tailscale/corp#3385
Updates tailscale/tailscale#3596
2 years ago
Brad Fitzpatrick af2c71c6e2 Dockerfile: remove old, unnnecessary, conflicting fetching of Go
The Makefile's toolchain target fetches the right Go version
nowadays. We can make the Dockerfile do that and cache it later, but
for now this at least prevents the Go version mismatch bugs.
2 years ago
Denton Gentry 078eee6b39 Dockerfile: use Go 1.16.5
Going to use the Tailscale fork of the Go toolchain instead.
3 years ago
Denton Gentry 7b2e61e80c Remove check for Tailscale toolchain.
Broke the F-Droid build.
Update Dockerfile to use Go 1.17rc1 to verify that as a fix.

Signed-off-by: Denton Gentry <dgentry@tailscale.com>
3 years ago
Elias Naur e007a9c153 android: bump target/compile SDK version to 30
Gio uses SDK 30 API now.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
3 years ago
Brad Fitzpatrick d66204ecfd Dockerfile: bump Go to 1.16, set ANDROID_SDK_ROOT for dockershell 3 years ago
Elias Naur d95d693a73 Dockerfile: bump Go version to 1.15.5
Signed-off-by: Elias Naur <mail@eliasnaur.com>
4 years ago
Elias Naur 4ca298d19a Dockerfile,Makefile: add dockershell Makefile target for Docker builds
Fixes tailscale/tailscale#424

Signed-off-by: Elias Naur <mail@eliasnaur.com>
4 years ago
Elias Naur 24e887bf48 Dockerfile: preload Gradle
Updates tailscale/tailscale#424

Signed-off-by: Elias Naur <mail@eliasnaur.com>
4 years ago
Elias Naur b97338939f Dockerfile: add SDK platform-tools and use build-tools version Gradle wants
Updates tailscale/tailscale#424

Signed-off-by: Elias Naur <mail@eliasnaur.com>
4 years ago
Elias Naur 0e400dfc57 Dockerfile: remove redundant Android SDK packages
Updates tailscale/tailscale#424

Signed-off-by: Elias Naur <mail@eliasnaur.com>
4 years ago
Brad Fitzpatrick 93cb1338e3 Start of a Dockerfile.
It can be improved a lot to be more incremental, but this is something for now.

Updates tailscale/tailscale#424
4 years ago