From 6c753c6a73b53df3177f830cbb0083219e94c787 Mon Sep 17 00:00:00 2001 From: Frank Edwards Date: Tue, 24 Dec 2024 15:04:40 +1000 Subject: [PATCH] 0.1.33 Alpine 3.19, Tailscale 1.78.1. Use Tailscale toolchain for build.sh. --- Dockerfile | 2 +- README.md | 2 +- build.sh | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index d47d65b..9538664 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ RUN GOARCH=$TARGETARCH go install -ldflags="-w -s\ RUN upx /go/bin/tailscale && upx /go/bin/tailscaled -FROM alpine:3.18 +FROM alpine:3.19 RUN apk add --no-cache ca-certificates iptables iproute2 ip6tables bash openssh curl jq diff --git a/README.md b/README.md index a3557bc..05c538e 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ Using the file `tailscale.tar` generated by running `build.sh`, upload the file If you want to see the container output in the router log add `logging=yes` to the container add command. -6b. Tar archive file (routers without external storage) +6c. Tar archive file (routers without external storage) For routers without USB port (tested on hAP ax2) it's possible to use ramdisk to temporary store `tailscale.tar` file. diff --git a/build.sh b/build.sh index 1118487..06c56ac 100755 --- a/build.sh +++ b/build.sh @@ -26,9 +26,9 @@ # Set PLATFORM as required for your router model. See: # https://mikrotik.com/products/matrix # -PLATFORM="linux/arm64" -TAILSCALE_VERSION=1.74.0 -VERSION=0.1.32 +PLATFORM="linux/amd64" +TAILSCALE_VERSION=1.78.1 +VERSION=0.1.33 set -eu @@ -39,6 +39,7 @@ then git -c advice.detachedHead=false clone https://github.com/tailscale/tailscale.git --branch v$TAILSCALE_VERSION fi +TS_USE_TOOLCHAIN="Y" cd tailscale && eval $(./build_dist.sh shellvars) && cd .. docker buildx build \