From e4c1ca574d4056b35e9fabe4b0c9261c708ae607 Mon Sep 17 00:00:00 2001 From: okxlin Date: Wed, 13 Dec 2023 23:04:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0tailscale=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/tailscale/1.54/.env.sample | 15 ++++++++------- apps/tailscale/1.54/data.yml | 7 +++++++ apps/tailscale/1.54/docker-compose.yml | 1 + apps/tailscale/latest/.env.sample | 15 ++++++++------- apps/tailscale/latest/data.yml | 7 +++++++ apps/tailscale/latest/docker-compose.yml | 1 + 6 files changed, 32 insertions(+), 14 deletions(-) diff --git a/apps/tailscale/1.54/.env.sample b/apps/tailscale/1.54/.env.sample index 210603f5..d84340fd 100644 --- a/apps/tailscale/1.54/.env.sample +++ b/apps/tailscale/1.54/.env.sample @@ -1,13 +1,14 @@ CONTAINER_NAME="tailscale" -TS_ACCEPT_DNS=false -TS_AUTH_ONCE=false +TS_ACCEPT_DNS="false" +TS_AUTH_ONCE="false" TS_AUTHKEY="tskey-auth-ab1CDE2CNTRL-0123456789abcdef" TS_DEST_IP="" -TS_KUBE_SECRET=tailscale -TS_HOSTNAME=my-tailscale-node +TS_KUBE_SECRET="tailscale" +TS_HOSTNAME="my-tailscale-node" TS_OUTBOUND_HTTP_PROXY_LISTEN="" TS_ROUTES="192.168.1.0/24,10.0.0.0/16" -TS_SOCKET=/var/run/tailscale/tailscaled.sock +TS_SOCKET="/var/run/tailscale/tailscaled.sock" TS_SOCKS5_SERVER="" -TS_STATE_DIR=/var/lib/tailscale -TS_USERSPACE=true +TS_STATE_DIR="/var/lib/tailscale" +TS_USERSPACE="true" +TS_EXTRA_ARGS="" diff --git a/apps/tailscale/1.54/data.yml b/apps/tailscale/1.54/data.yml index 93598bad..4d493c50 100644 --- a/apps/tailscale/1.54/data.yml +++ b/apps/tailscale/1.54/data.yml @@ -84,3 +84,10 @@ additionalProperties: labelZh: 启用用户空间网络 (true/false) required: false type: text + - default: '' + edit: true + envKey: TS_EXTRA_ARGS + labelEn: Any other flags for tailscaled (--login-server=https://login.example.com) + labelZh: 更多命令参数 (--login-server=https://login.example.com) + required: false + type: text diff --git a/apps/tailscale/1.54/docker-compose.yml b/apps/tailscale/1.54/docker-compose.yml index bfe9d73a..6035c46c 100644 --- a/apps/tailscale/1.54/docker-compose.yml +++ b/apps/tailscale/1.54/docker-compose.yml @@ -23,6 +23,7 @@ services: - TS_SOCKS5_SERVER=${TS_SOCKS5_SERVER} - TS_STATE_DIR=${TS_STATE_DIR} - TS_USERSPACE=${TS_USERSPACE} + - TS_EXTRA_ARGS=${TS_EXTRA_ARGS} image: tailscale/tailscale:v1.54 labels: createdBy: "Apps" diff --git a/apps/tailscale/latest/.env.sample b/apps/tailscale/latest/.env.sample index 210603f5..d84340fd 100644 --- a/apps/tailscale/latest/.env.sample +++ b/apps/tailscale/latest/.env.sample @@ -1,13 +1,14 @@ CONTAINER_NAME="tailscale" -TS_ACCEPT_DNS=false -TS_AUTH_ONCE=false +TS_ACCEPT_DNS="false" +TS_AUTH_ONCE="false" TS_AUTHKEY="tskey-auth-ab1CDE2CNTRL-0123456789abcdef" TS_DEST_IP="" -TS_KUBE_SECRET=tailscale -TS_HOSTNAME=my-tailscale-node +TS_KUBE_SECRET="tailscale" +TS_HOSTNAME="my-tailscale-node" TS_OUTBOUND_HTTP_PROXY_LISTEN="" TS_ROUTES="192.168.1.0/24,10.0.0.0/16" -TS_SOCKET=/var/run/tailscale/tailscaled.sock +TS_SOCKET="/var/run/tailscale/tailscaled.sock" TS_SOCKS5_SERVER="" -TS_STATE_DIR=/var/lib/tailscale -TS_USERSPACE=true +TS_STATE_DIR="/var/lib/tailscale" +TS_USERSPACE="true" +TS_EXTRA_ARGS="" diff --git a/apps/tailscale/latest/data.yml b/apps/tailscale/latest/data.yml index 93598bad..4d493c50 100644 --- a/apps/tailscale/latest/data.yml +++ b/apps/tailscale/latest/data.yml @@ -84,3 +84,10 @@ additionalProperties: labelZh: 启用用户空间网络 (true/false) required: false type: text + - default: '' + edit: true + envKey: TS_EXTRA_ARGS + labelEn: Any other flags for tailscaled (--login-server=https://login.example.com) + labelZh: 更多命令参数 (--login-server=https://login.example.com) + required: false + type: text diff --git a/apps/tailscale/latest/docker-compose.yml b/apps/tailscale/latest/docker-compose.yml index 441ced9f..b22aaa7c 100644 --- a/apps/tailscale/latest/docker-compose.yml +++ b/apps/tailscale/latest/docker-compose.yml @@ -23,6 +23,7 @@ services: - TS_SOCKS5_SERVER=${TS_SOCKS5_SERVER} - TS_STATE_DIR=${TS_STATE_DIR} - TS_USERSPACE=${TS_USERSPACE} + - TS_EXTRA_ARGS=${TS_EXTRA_ARGS} image: tailscale/tailscale:latest labels: createdBy: "Apps"