mirror of
https://github.com/jbowdre/tailscale-docker.git
synced 2024-12-22 05:32:18 +00:00
support extra args to tailscale up
This commit is contained in:
parent
9e4c2bb4e5
commit
54da987ff5
5 changed files with 14 additions and 6 deletions
|
@ -21,6 +21,7 @@ Expected environment variables:
|
||||||
| `TS_HOSTNAME` | `my-app` | optional Tailscale hostname for the new node |
|
| `TS_HOSTNAME` | `my-app` | optional Tailscale hostname for the new node |
|
||||||
| `TS_STATE_DIR` | `/var/lib/tailscale/` | required directory for storing Tailscale state, this should be mounted to the container for persistence |
|
| `TS_STATE_DIR` | `/var/lib/tailscale/` | required directory for storing Tailscale state, this should be mounted to the container for persistence |
|
||||||
| `TS_TAILSCALED_EXTRA_ARGS` | `--verbose=1` | optional additional [flags](https://tailscale.com/kb/1278/tailscaled#flags-to-tailscaled) for `tailscaled` |
|
| `TS_TAILSCALED_EXTRA_ARGS` | `--verbose=1` | optional additional [flags](https://tailscale.com/kb/1278/tailscaled#flags-to-tailscaled) for `tailscaled` |
|
||||||
|
| `TS_EXTRA_ARGS` | `--ssh` | optional additional [flags](https://tailscale.com/kb/1241/tailscale-up) for `tailscale up` |
|
||||||
| `TS_SERVE_PORT` | `8080` | optional application port to expose with [Tailscale Serve](https://tailscale.com/kb/1312/serve) |
|
| `TS_SERVE_PORT` | `8080` | optional application port to expose with [Tailscale Serve](https://tailscale.com/kb/1312/serve) |
|
||||||
| `TS_FUNNEL` | `1` | if set (to anything), will proxy `TS_SERVE_PORT` **publicly** with [Tailscale Funnel](https://tailscale.com/kb/1223/funnel) |
|
| `TS_FUNNEL` | `1` | if set (to anything), will proxy `TS_SERVE_PORT` **publicly** with [Tailscale Funnel](https://tailscale.com/kb/1223/funnel) |
|
||||||
|
|
||||||
|
|
|
@ -2,5 +2,6 @@
|
||||||
TS_AUTHKEY="" # Required Tailscale auth key
|
TS_AUTHKEY="" # Required Tailscale auth key
|
||||||
TS_HOSTNAME="" # Optional hostname for this node
|
TS_HOSTNAME="" # Optional hostname for this node
|
||||||
TS_TAILSCALED_EXTRA_ARGS="" # Optional additional arguments for tailscaled
|
TS_TAILSCALED_EXTRA_ARGS="" # Optional additional arguments for tailscaled
|
||||||
|
TS_EXTRA_ARGS="" # Optional additional arguments for tailscale up
|
||||||
TS_SERVE_PORT="" # Optional backend port to proxy with tailscale serve
|
TS_SERVE_PORT="" # Optional backend port to proxy with tailscale serve
|
||||||
TS_FUNNEL="" # If set, serve publicly with tailscale funnel
|
TS_FUNNEL="" # If set, serve publicly with tailscale funnel
|
|
@ -7,6 +7,8 @@ services:
|
||||||
TS_AUTHKEY: ${TS_AUTHKEY:?err} # from https://login.tailscale.com/admin/settings/authkeys
|
TS_AUTHKEY: ${TS_AUTHKEY:?err} # from https://login.tailscale.com/admin/settings/authkeys
|
||||||
TS_HOSTNAME: ${TS_HOSTNAME:-ts-docker}
|
TS_HOSTNAME: ${TS_HOSTNAME:-ts-docker}
|
||||||
TS_STATE_DIR: "/var/lib/tailscale/" # store ts state in a local volume
|
TS_STATE_DIR: "/var/lib/tailscale/" # store ts state in a local volume
|
||||||
|
TS_TAILSCALED_EXTRA_ARGS: ${TS_TAILSCALED_EXTRA_ARGS:-} # optional extra args to pass to tailscaled
|
||||||
|
TS_EXTRA_ARGS: ${TS_EXTRA_ARGS:-} # optional extra flags to pass to tailscale up
|
||||||
TS_SERVE_PORT: ${TS_SERVE_PORT:-} # optional port to proxy with tailscale serve (ex: '80')
|
TS_SERVE_PORT: ${TS_SERVE_PORT:-} # optional port to proxy with tailscale serve (ex: '80')
|
||||||
TS_FUNNEL: ${TS_FUNNEL:-} # if set, serve publicly with tailscale funnel
|
TS_FUNNEL: ${TS_FUNNEL:-} # if set, serve publicly with tailscale funnel
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -3,7 +3,7 @@ trap 'kill -TERM $PID' TERM INT
|
||||||
echo "Starting Tailscale daemon"
|
echo "Starting Tailscale daemon"
|
||||||
tailscaled --tun=userspace-networking --statedir="${TS_STATE_DIR}" ${TS_TAILSCALED_EXTRA_ARGS} &
|
tailscaled --tun=userspace-networking --statedir="${TS_STATE_DIR}" ${TS_TAILSCALED_EXTRA_ARGS} &
|
||||||
PID=$!
|
PID=$!
|
||||||
until tailscale up --authkey="${TS_AUTHKEY}" --hostname="${TS_HOSTNAME}"; do
|
until tailscale up --authkey="${TS_AUTHKEY}" --hostname="${TS_HOSTNAME}" ${TS_EXTRA_ARGS}; do
|
||||||
sleep 0.1
|
sleep 0.1
|
||||||
done
|
done
|
||||||
tailscale status
|
tailscale status
|
||||||
|
|
|
@ -21,6 +21,10 @@ spec:
|
||||||
value: "${TS_HOSTNAME:-ts-docker}"
|
value: "${TS_HOSTNAME:-ts-docker}"
|
||||||
- name: TS_STATE_DIR
|
- name: TS_STATE_DIR
|
||||||
value: "/var/lib/tailscale"
|
value: "/var/lib/tailscale"
|
||||||
|
- name: TS_TAILSCALED_EXTRA_ARGS
|
||||||
|
value: "${TS_TAILSCALED_EXTRA_ARGS:-}"
|
||||||
|
- name: TS_EXTRA_ARGS
|
||||||
|
value: "${TS_EXTRA_ARGS:-}"
|
||||||
- name: TS_SERVE_PORT
|
- name: TS_SERVE_PORT
|
||||||
value: "${TS_SERVE_PORT:-}"
|
value: "${TS_SERVE_PORT:-}"
|
||||||
- name: TS_FUNNEL
|
- name: TS_FUNNEL
|
||||||
|
|
Loading…
Reference in a new issue