Add UPDATE_TAILSCALE option.
This commit is contained in:
Frank Edwards 2024-01-06 10:39:50 +10:00
parent c2c60fd964
commit 08c077d081
3 changed files with 9 additions and 1 deletions

View file

@ -73,6 +73,7 @@ This section follows the Mikrotik Container documentation with additional steps
| ADVERTISE_ROUTES | Comma-separated list of routes to advertise | | | ADVERTISE_ROUTES | Comma-separated list of routes to advertise | |
| CONTAINER_GATEWAY | The container bridge (veth1) IP address on the router | | | 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 | | 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 | | TAILSCALED_ARGS | Additional arguments passed to tailscaled | Optional |
@ -83,6 +84,7 @@ add name="tailscale" key="PASSWORD" value="xxxxxxxxxxxxxx"
add name="tailscale" key="AUTH_KEY" value="tskey-xxxxxxxxxxxxxxxxxxxxxxxx" add name="tailscale" key="AUTH_KEY" value="tskey-xxxxxxxxxxxxxxxxxxxxxxxx"
add name="tailscale" key="ADVERTISE_ROUTES" value="192.168.88.0/24" add name="tailscale" key="ADVERTISE_ROUTES" value="192.168.88.0/24"
add name="tailscale" key="CONTAINER_GATEWAY" value="172.17.0.1" add name="tailscale" key="CONTAINER_GATEWAY" value="172.17.0.1"
add name="tailscale" key="UPDATE_TAILSCALE"
add name="tailscale" key="TAILSCALE_ARGS" value="--accept-routes --advertise-exit-node" add name="tailscale" key="TAILSCALE_ARGS" value="--accept-routes --advertise-exit-node"
``` ```
Example Headscale control server configuration: Example Headscale control server configuration:

View file

@ -26,7 +26,7 @@
# #
PLATFORM="linux/arm/v7" PLATFORM="linux/arm/v7"
TAILSCALE_VERSION=1.52.1 TAILSCALE_VERSION=1.52.1
VERSION=0.1.25 VERSION=0.1.26
set -eu set -eu
@ -41,6 +41,7 @@ cd tailscale && eval $(./build_dist.sh shellvars) && cd ..
docker buildx build \ docker buildx build \
--no-cache \ --no-cache \
--build-arg TAILSCALE_VERSION=$TAILSCALE_VERSION \
--build-arg VERSION_LONG=$VERSION_LONG \ --build-arg VERSION_LONG=$VERSION_LONG \
--build-arg VERSION_SHORT=$VERSION_SHORT \ --build-arg VERSION_SHORT=$VERSION_SHORT \
--build-arg VERSION_GIT_HASH=$VERSION_GIT_HASH \ --build-arg VERSION_GIT_HASH=$VERSION_GIT_HASH \

View file

@ -21,6 +21,11 @@ for s in "${SUBNETS[@]}"; do
ip route add "$s" via "${CONTAINER_GATEWAY}" ip route add "$s" via "${CONTAINER_GATEWAY}"
done done
# Perform an update if set
if [[ ! -z "${UPDATE_TAILSCALE+x}" ]]; then
/usr/local/bin/tailscale update --yes
fi
# Set login server for tailscale # Set login server for tailscale
if [[ -z "$LOGIN_SERVER" ]]; then if [[ -z "$LOGIN_SERVER" ]]; then
LOGIN_SERVER=https://controlplane.tailscale.com LOGIN_SERVER=https://controlplane.tailscale.com