mirror of
https://github.com/Fluent-networks/tailscale-mikrotik.git
synced 2025-06-30 12:34:32 +02:00
0.1.27
Tailscale 1.56.1 Fix registering nodes via Oauth
This commit is contained in:
parent
08c077d081
commit
3112ea2b10
4 changed files with 8 additions and 8 deletions
|
@ -54,7 +54,7 @@ RUN GOARCH=$TARGETARCH go install -ldflags="\
|
||||||
-X tailscale.com/version.GitCommit=$VERSION_GIT_HASH" \
|
-X tailscale.com/version.GitCommit=$VERSION_GIT_HASH" \
|
||||||
-v ./cmd/tailscale ./cmd/tailscaled
|
-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
|
RUN apk add --no-cache ca-certificates iptables iproute2 bash openssh curl jq
|
||||||
|
|
||||||
|
|
|
@ -69,12 +69,12 @@ This section follows the Mikrotik Container documentation with additional steps
|
||||||
| Variable | Description | Comment |
|
| Variable | Description | Comment |
|
||||||
| ----------------- | --------------------------------------------- | -------------------------------------------- |
|
| ----------------- | --------------------------------------------- | -------------------------------------------- |
|
||||||
| PASSWORD | System root user password | |
|
| 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 | |
|
| 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 | |
|
| 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 |
|
||||||
|
|
||||||
Example Tailscale control server configuration:
|
Example Tailscale control server configuration:
|
||||||
|
|
6
build.sh
6
build.sh
|
@ -24,9 +24,9 @@
|
||||||
# Set PLATFORM as required for your router model. See:
|
# Set PLATFORM as required for your router model. See:
|
||||||
# https://mikrotik.com/products/matrix
|
# https://mikrotik.com/products/matrix
|
||||||
#
|
#
|
||||||
PLATFORM="linux/arm/v7"
|
PLATFORM="linux/amd64"
|
||||||
TAILSCALE_VERSION=1.52.1
|
TAILSCALE_VERSION=1.56.1
|
||||||
VERSION=0.1.26
|
VERSION=0.1.27
|
||||||
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
|
|
|
@ -34,8 +34,8 @@ fi
|
||||||
# Start tailscaled and bring tailscale up
|
# Start tailscaled and bring tailscale up
|
||||||
/usr/local/bin/tailscaled ${TAILSCALED_ARGS} &
|
/usr/local/bin/tailscaled ${TAILSCALED_ARGS} &
|
||||||
until /usr/local/bin/tailscale up \
|
until /usr/local/bin/tailscale up \
|
||||||
--reset --authkey=${AUTH_KEY} \
|
--reset --authkey="${AUTH_KEY}" \
|
||||||
--login-server ${LOGIN_SERVER} \
|
--login-server "${LOGIN_SERVER}" \
|
||||||
--advertise-routes="${ADVERTISE_ROUTES}" \
|
--advertise-routes="${ADVERTISE_ROUTES}" \
|
||||||
${TAILSCALE_ARGS}
|
${TAILSCALE_ARGS}
|
||||||
do
|
do
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue