Migrate Tailscale configuration to YAML and update proxy settings #21

atj4me · 2025-09-12T17:46:15Z

The Issue

Fixes Move the Tailsclae from independent container to a web daemon #19

Migrated from Docker Compose to a DDEV config-based approach for Tailscale router integration, removed unnecessary files, and updated Tailscale serve config for Funnel support and dynamic port handling.

How This PR Solves The Issue

Replaces docker-compose.tailscale-router.yaml with config.tailscale.yaml using DDEV’s config features.
Removes socat dependency and uses Tailscale’s built-in serve functionality.
Ensures persistent state and config volumes.
Updates tailscale-private.json and tailscale-public.json to use Funnel and dynamic DDEV_ROUTER_HTTP_PORT.
Cleans up obsolete files.

Manual Testing Instructions

ddev add-on get https://github.com/atj4me/ddev-tailscale-router/tarball/refs/pull/21/head
ddev restart

…d Dockerfile for Tailscale installation

…ockerfile for Tailscale installation

…les in Dockerfile

…reformatting

…ilscale.yaml for Tailscale service

…ties

…ig.tailscale-router.yaml

… new daemon script

…ete configuration files

…args in Tailscale commands

…e daemon script

…ariable

Copilot

Pull Request Overview

Migrates Tailscale configuration from Docker Compose standalone service to DDEV's web container with built-in service management, removing the socat dependency and simplifying the architecture.

Replaces separate tailscale-router container with web container daemons using DDEV's web_extra_daemons configuration
Updates command wrapper to handle dynamic port forwarding and improved --public flag handling for Funnel support
Removes obsolete configuration files and updates tests to reflect the new architecture

Reviewed Changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
config.tailscale-router.yaml	New DDEV config file defining Tailscale daemons in web container
web-build/Dockerfile.tailscale-router	Dockerfile for installing Tailscale in web container
docker-compose.tailscale-router.yaml	Simplified to only add environment variables to web service
commands/host/tailscale	Enhanced command wrapper with improved share/funnel handling and dynamic port support
tests/test.bats	Updated tests to remove obsolete container-specific tests
install.yaml	Updated project files list to reflect new architecture
tailscale-router/config/	Removed obsolete JSON configuration files
README.md	Updated documentation to reflect new command options and architecture

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

config.tailscale-router.yaml

commands/host/tailscale

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull Request Overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 5 comments.

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

config.tailscale-router.yaml

docker-compose.tailscale-router.yaml

commands/host/tailscale

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull Request Overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

commands/host/tailscale

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull Request Overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

commands/host/tailscale

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull Request Overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

commands/host/tailscale

install.yaml

stasadev · 2025-09-15T13:20:23Z

web-build/Dockerfile.tailscale-router

+# This Dockerfile installs Tailscale in a web container.
+ARG BASE_IMAGE
+FROM $BASE_IMAGE
+
+# Install Tailscale using the official install script
+RUN apt-get update && \
+    apt-get install -y curl && \
+    rm -rf /var/lib/apt/lists/* && \
+    curl -fsSL https://tailscale.com/install.sh | sh


Can be simplified to:

Suggested change

# This Dockerfile installs Tailscale in a web container.

ARG BASE_IMAGE

FROM $BASE_IMAGE

# Install Tailscale using the official install script

RUN apt-get update && \

apt-get install -y curl && \

rm -rf /var/lib/apt/lists/* && \

curl -fsSL https://tailscale.com/install.sh | sh

RUN curl -fsSL https://tailscale.com/install.sh | sh

curl is already here, ARG*FROM is not needed these days.

oh. I was getting a syntax error in VSCode, so I added the FROM $BASE_IMAGE and installed curl for safety. Thanks for pointing it out.

stasadev · 2025-09-15T13:24:56Z

docker-compose.tailscale-router.yaml

-      TS_USERSPACE: "true"
-      TS_PRIVACY: ${TS_PRIVACY:-private}
-      TS_SERVE_CONFIG: /config/tailscale-${TS_PRIVACY:-private}.json
+        - TS_AUTHKEY=${TS_AUTHKEY}


Suggested change

- TS_AUTHKEY=${TS_AUTHKEY}

- TS_AUTHKEY=${TS_AUTHKEY:-}

atj4me added 22 commits September 12, 2025 13:43

feat: migrate tailscale configuration to YAML and update proxy settings

159baf9

fix: update project_files to reference correct configuration file

9935792

fix: update web_extra_exposed_ports to use string format

97fa037

fix: remove unused web_extra_volumes configuration

4fe2ef6

fix: remove web_extra_exposed_ports configuration

fd30bff

feat: add Dockerfile for Tailscale installation and update project files

876ea00

fix: update project_files to reference correct Dockerfile path and ad…

b6e41c4

…d Dockerfile for Tailscale installation

feat: update install.yaml to reference Dockerfile.tailscale and add D…

a936675

…ockerfile for Tailscale installation

feat: simplify Tailscale command in config and add environment variab…

d6f5403

…les in Dockerfile

fix: add missing comments to Dockerfile.tailscale for clarity

58eca19

fix: add missing newline for clarity in config.tailscale.yaml

7b7864a

fix: improve clarity in config.tailscale.yaml by adding comments and …

5c26b7e

…reformatting

fix: correct paths in config.tailscale.yaml and add docker-compose.ta…

b69781d

…ilscale.yaml for Tailscale service

feat: add Tailscale configuration and Dockerfile for routing capabili…

13e2176

…ties

fix: update project file reference from config.tailscale.yaml to conf…

e917db2

…ig.tailscale-router.yaml

feat: enhance Tailscale routing setup with improved configuration and…

dca717e

… new daemon script

feat: add 'share' command to Tailscale functionality and remove obsol…

53886d9

…ete configuration files

fix: remove obsolete Tailscale configuration files from install.yaml

dc46227

chore: update configuration for Tailscale routing capabilities

96931a4

feat: add support for sharing with public flag and forward arbitrary …

000a123

…args in Tailscale commands

feat: update Tailscale share command documentation and remove obsolet…

ecb3771

…e daemon script

fix: update ownership command in Dockerfile to use dynamic username v…

bbcb5a3

…ariable

atj4me requested a review from Copilot September 13, 2025 00:29

Copilot AI reviewed Sep 13, 2025

View reviewed changes

config.tailscale-router.yaml Outdated Show resolved Hide resolved

config.tailscale-router.yaml Outdated Show resolved Hide resolved

commands/host/tailscale Outdated Show resolved Hide resolved

atj4me and others added 3 commits September 12, 2025 20:31

Update config.tailscale-router.yaml

5e03fe1

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update config.tailscale-router.yaml

78e8aa4

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update commands/host/tailscale

34ce943

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

atj4me requested a review from Copilot September 13, 2025 00:31

Copilot AI reviewed Sep 13, 2025

View reviewed changes

Update config.tailscale-router.yaml

666e005

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

atj4me and others added 2 commits September 12, 2025 20:34

Update commands/host/tailscale

2bce8a3

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Refactor Tailscale command and update configuration for hostname

9ef1771

atj4me requested a review from Copilot September 13, 2025 01:10

Copilot AI reviewed Sep 13, 2025

View reviewed changes

commands/host/tailscale Outdated Show resolved Hide resolved

commands/host/tailscale Outdated Show resolved Hide resolved

atj4me and others added 2 commits September 12, 2025 23:34

Update commands/host/tailscale

acee5df

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Apply suggestion from @Copilot

68f090c

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

atj4me requested a review from Copilot September 13, 2025 03:36

Copilot AI reviewed Sep 13, 2025

View reviewed changes

commands/host/tailscale Outdated Show resolved Hide resolved

commands/host/tailscale Outdated Show resolved Hide resolved

commands/host/tailscale Outdated Show resolved Hide resolved

atj4me and others added 2 commits September 12, 2025 23:39

Apply suggestion from @Copilot

4638319

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Apply suggestion from @Copilot

b78154c

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

atj4me requested a review from Copilot September 13, 2025 03:39

Copilot AI reviewed Sep 13, 2025

View reviewed changes

commands/host/tailscale Show resolved Hide resolved

commands/host/tailscale Show resolved Hide resolved

install.yaml Show resolved Hide resolved

stasadev reviewed Sep 15, 2025

View reviewed changes

Migrate Tailscale configuration to YAML and update proxy settings #21

Are you sure you want to change the base?

Migrate Tailscale configuration to YAML and update proxy settings #21

Uh oh!

Conversation

atj4me commented Sep 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

The Issue

How This PR Solves The Issue

Manual Testing Instructions

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stasadev Sep 15, 2025

Choose a reason for hiding this comment

Uh oh!

atj4me Sep 15, 2025

Choose a reason for hiding this comment

Uh oh!

stasadev Sep 15, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

atj4me commented Sep 12, 2025 •

edited

Loading