From 773853cc3a60a81d6e3ee6a933a9b34322312adb Mon Sep 17 00:00:00 2001 From: pablomendezroyo <41727368+pablomendezroyo@users.noreply.github.com> Date: Tue, 11 Feb 2025 14:54:44 +0100 Subject: [PATCH] Set routes as env and add private subnet to the defaults (#2) * Set routes as env and add private subnet to the defaults * fix envs --------- Co-authored-by: Pablo Mendez --- Dockerfile | 3 +-- docker-compose.yml | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 24b0009..998c5a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,5 +2,4 @@ ARG UPSTREAM_VERSION FROM tailscale/tailscale:${UPSTREAM_VERSION} ENV TS_STATE_DIR=/var/lib/tailscale -ENV TS_USERSPACE=false -ENV TS_EXTRA_ARGS="--advertise-routes=172.33.0.0/16 --advertise-exit-node $EXTRA_OPTS" +ENV TS_USERSPACE=false \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index be351cc..a4b8a62 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.5' +version: "3.5" services: tailscale: build: @@ -8,8 +8,9 @@ services: image: tailscale.dnp.dappnode.eth:0.1.0 restart: unless-stopped environment: - - TS_AUTHKEY= - - EXTRA_OPTS= + - TS_AUTHKEY= # https://tailscale.com/kb/1282/docker#ts_authkey + - TS_ROUTES=172.33.0.0/16,10.20.0.0/24 # https://tailscale.com/kb/1282/docker#ts_routes 172.33.0.0/16 is the current subnet in dappnode and 10.20.0.0/24 will be eventually used as the new subnet + - TS_EXTRA_ARGS=--advertise-exit-node # https://tailscale.com/kb/1282/docker#ts_extra_args volumes: - state:/var/lib/tailscale cap_add: @@ -18,4 +19,4 @@ services: devices: - /dev/net/tun:/dev/net/tun volumes: - state: \ No newline at end of file + state: