diff --git a/Dockerfile b/Dockerfile index b5911e9..d3f1cd4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,7 +54,7 @@ RUN GOARCH=$TARGETARCH go install -ldflags="\ -X tailscale.com/version.GitCommit=$VERSION_GIT_HASH" \ -v ./cmd/tailscale ./cmd/tailscaled -FROM alpine:3.16 +FROM alpine:3.18 RUN apk add --no-cache ca-certificates iptables iproute2 bash openssh curl jq diff --git a/README.md b/README.md index 92d072b..21a28e4 100644 --- a/README.md +++ b/README.md @@ -69,12 +69,12 @@ This section follows the Mikrotik Container documentation with additional steps | Variable | Description | Comment | | ----------------- | --------------------------------------------- | -------------------------------------------- | | PASSWORD | System root user password | | -| AUTH_KEY | Tailscale non-reusable key or Headscale pre-authenticated key | Generate from the Tailscale console or Headscale CLI | +| AUTH_KEY | Tailscale non-reusable key, [Oauth secret](https://tailscale.com/kb/1215/oauth-clients#registering-new-nodes-using-oauth-credentials) or Headscale pre-authenticated key | Generate from the Tailscale console or Headscale CLI | | ADVERTISE_ROUTES | Comma-separated list of routes to advertise | | | CONTAINER_GATEWAY | The container bridge (veth1) IP address on the router | | | LOGIN_SERVER | Headscale login server | Only required for Headscale control server. Do not set if using Tailscale | | UPDATE_TAILSCALE | Update tailscale on container startup | | -| TAILSCALE_ARGS | Additional arguments passed to tailscale | Optional | +| TAILSCALE_ARGS | Additional arguments passed to tailscale | Optional | | TAILSCALED_ARGS | Additional arguments passed to tailscaled | Optional | Example Tailscale control server configuration: diff --git a/build.sh b/build.sh index 8eee4b6..ec10a80 100755 --- a/build.sh +++ b/build.sh @@ -24,9 +24,9 @@ # Set PLATFORM as required for your router model. See: # https://mikrotik.com/products/matrix # -PLATFORM="linux/arm/v7" -TAILSCALE_VERSION=1.52.1 -VERSION=0.1.26 +PLATFORM="linux/amd64" +TAILSCALE_VERSION=1.56.1 +VERSION=0.1.27 set -eu diff --git a/tailscale.sh b/tailscale.sh index 389c8f9..1967d4d 100755 --- a/tailscale.sh +++ b/tailscale.sh @@ -34,8 +34,8 @@ fi # Start tailscaled and bring tailscale up /usr/local/bin/tailscaled ${TAILSCALED_ARGS} & until /usr/local/bin/tailscale up \ - --reset --authkey=${AUTH_KEY} \ - --login-server ${LOGIN_SERVER} \ + --reset --authkey="${AUTH_KEY}" \ + --login-server "${LOGIN_SERVER}" \ --advertise-routes="${ADVERTISE_ROUTES}" \ ${TAILSCALE_ARGS} do