New service structure

.github/workflows/build-image.yml

@@ -0,0 +1,11 @@
+name: Build Image
+
+on:
+  release:
+    types: [published]
+  push:
+
+jobs:
+  build-and-deploy:
+    name: Build and deploy
+    uses: chukysoria/workflows/.github/workflows/build-image-simple.yml@624bd5750a5e2f4ffc50b89977fd840b66c4f1c1 # v1.1.38

.github/workflows/draft-release.yml

@@ -0,0 +1,14 @@
+name: 'Release Drafter'
+
+on:
+  push:
+    branches:
+      - main
+      - master
+
+jobs:
+  update_release_draft:
+    name: Release
+    uses: chukysoria/workflows/.github/workflows/new-release.yml@624bd5750a5e2f4ffc50b89977fd840b66c4f1c1 # v1.1.38
+    with:
+      simple-build: true

.github/workflows/labels.yml

@@ -0,0 +1,21 @@
+---
+
+name: Sync labels
+
+on:
+  push:
+    branches:
+      - main
+      - master
+    paths:
+      - .github/labels.yml
+  schedule:
+    - cron: "34 5 * * *"
+  workflow_dispatch:
+
+
+jobs:
+  labels:
+    name: ♻️ Sync labels
+    uses: chukysoria/workflows/.github/workflows/labels.yml@624bd5750a5e2f4ffc50b89977fd840b66c4f1c1 # v1.1.38
+

.github/workflows/permissions.yml

@@ -0,0 +1,10 @@
+name: Permission check
+on:
+  pull_request_target:
+    paths:
+      - '**/run'
+      - '**/finish'
+      - '**/check'
+jobs:
+  permission_check:
+    uses: chukysoria/workflows/.github/workflows/init-svc-executable-permissions.yml@624bd5750a5e2f4ffc50b89977fd840b66c4f1c1 # v1.1.38

README.md

@@ -1,5 +1,5 @@
 # The Tailscale universal Docker mod
-
+ 
 This Docker mod lets you slipstream Tailscale into
 [linuxserver.io](https://linuxserver.io) containers. This lets you
 have applications join your tailnet.
@@ -11,7 +11,7 @@ use to configure it.
 
 | Environment Variable   | Description                                                                                                                                                                                                                                                                                                   | Example                                  |
 | :--------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | :--------------------------------------- |
-| `DOCKER_MODS`          | The list of additional mods to layer on top of the running container, separated by pipes.                                                                                                                                                                                                                     | `ghcr.io/tailscale-dev/docker-mod:main`  |
+| `DOCKER_MODS`          | The list of additional mods to layer on top of the running container, separated by pipes.                                                                                                                                                                                                                     | `chukysoria/docker-mod:main`  |
 | `TAILSCALE_STATE_DIR`  | The directory where the Tailscale state will be stored, this should be pointed to a Docker volume. If it is not, then the node will set itself as ephemeral, making the node disappear from your tailnet when the container exits.                                                                            | `/var/lib/tailscale`                     |
 | `TAILSCALE_AUTHKEY`    | The authkey for your tailnet. You can create one in the [admin panel](https://login.tailscale.com/admin/settings/keys). See [here](https://tailscale.com/kb/1085/auth-keys/) for more information about authkeys and what you can do with them.                                                               | `tskey-auth-hunter2CNTRL-hunter2hunter2` |
 | `TAILSCALE_HOSTNAME`   | The hostname that you want to set for the container. If you don't set this, the hostname of the node on your tailnet will be a bunch of random hexadecimal numbers, which many humans find hard to remember.                                                                                                  | `wiki`                                   |

build.yaml

@@ -0,0 +1 @@
+----

config.yaml

@@ -0,0 +1,8 @@
+---
+image:  tailscale-mod
+version: v1.1.8
+name: TailscaleMod
+description: "Tailscale Mod Install Tailscale VPN within a container."
+ext_release: 1.1.0
+arch:
+  - all

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>chukysoria/renovate-config"
+  ]
+}

root/etc/s6-overlay/s6-rc.d/init-mod-universal-tailscale-postinstall/run

@@ -2,10 +2,6 @@
 
 set -euo pipefail
 
-dir="$(mktemp -d)"
-pushd .
-cd "${dir}"
-
 GOARCH=""
 
 case `uname -m` in
@@ -19,6 +15,9 @@ case `uname -m` in
     riscv64)
         GOARCH="riscv64"
         ;;
+    armv7l)
+        GOARCH="arm"
+        ;;
     *)
         echo "Unknown CPU type $(uname -m), please file a bug at https://github.com/tailscale-dev/docker-mod"
         exit 125
@@ -28,12 +27,28 @@ esac
 tarball="$(curl 'https://pkgs.tailscale.com/stable/?mode=json' | jq -r .Tarballs.${GOARCH})"
 version="$(echo ${tarball} | cut -d_ -f2)"
 
-curl "https://pkgs.tailscale.com/stable/${tarball}" -o tailscale.tgz
+if [ -f /usr/bin/tailscale ]; then
+  installed_version="$(tailscale -V | head -n1)"
+else
+  installed_version=""
+fi
+
+if [[ $version == $installed_version ]]; then
+  echo "[mod-tailscale] Tailscale ${version} already installed"
+else
+  dir="$(mktemp -d)"
+  pushd .
+  cd "${dir}"
+
+  echo "[mod-tailscale] Downloading Tailscale ${version}"
+
+  curl "https://pkgs.tailscale.com/stable/${tarball}" -o tailscale.tgz
 
-tar xzf tailscale.tgz
+  tar xzf tailscale.tgz
 
-cp -vrf "tailscale_${version}_${GOARCH}"/tailscale /usr/bin/tailscale
-cp -vrf "tailscale_${version}_${GOARCH}"/tailscaled /usr/sbin/tailscaled
+  cp -vrf "tailscale_${version}_${GOARCH}"/tailscale /usr/bin/tailscale
+  cp -vrf "tailscale_${version}_${GOARCH}"/tailscaled /usr/sbin/tailscaled
 
-popd
-rm -rf "${dir}"
+  popd
+  rm -rf "${dir}"
+fi

root/etc/s6-overlay/s6-rc.d/init-mod-universal-tailscale/run

@@ -1,15 +1,19 @@
 #!/usr/bin/with-contenv bash
 
-## Ubuntu
-if [ -f /usr/bin/apt ]; then
-    echo "\
-        jq \
-        iptables" >> /mod-repo-packages-to-install.list
+if [ ! -f /usr/bin/curl ] || [ ! -f /usr/bin/jq ] || [ ! -f /usr/sbin/iptables ]; then
+    ## Ubuntu
+    if [ -f /usr/bin/apt ]; then
+        echo "\
+            curl \
+            jq \
+            nftables" >> /mod-repo-packages-to-install.list
 
-fi
-# Alpine
-if [ -f /sbin/apk ]; then
-    echo "\
-        jq \
-        iptables" >> /mod-repo-packages-to-install.list
+    fi
+    # Alpine
+    if [ -f /sbin/apk ]; then
+        echo "\
+            curl \
+            jq \
+            nftables" >> /mod-repo-packages-to-install.list
+    fi
 fi

root/etc/s6-overlay/s6-rc.d/svc-tailscale-up/run → root/etc/s6-overlay/s6-rc.d/svc-mod-tailscale-up/run

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-FLAGS=""
+FLAGS="--stateful-filtering"
 
 # configure `tailscale up`
 if ! [ -v TAILSCALE_AUTHKEY ]; then
@@ -29,15 +29,19 @@ fi
 
 tailscale up $FLAGS
 
-# configure serve or funnel
+# configure serve or funnel, or reset if not set/removed
 if [ -v TAILSCALE_SERVE_PORT ] && [ -v TAILSCALE_SERVE_MODE ]; then
 
     if [ -v TAILSCALE_FUNNEL ]; then
         tailscale funnel --bg --"${TAILSCALE_SERVE_MODE}"=443 http://localhost:"${TAILSCALE_SERVE_PORT}"
     else
+        tailscale funnel reset
         tailscale serve --bg --"${TAILSCALE_SERVE_MODE}"=443 http://localhost:"${TAILSCALE_SERVE_PORT}"
     fi
-
+
+else
+    tailscale serve reset
+    tailscale funnel reset 
 fi
 
 

root/etc/s6-overlay/s6-rc.d/svc-mod-tailscale-up/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/svc-mod-tailscale-up/run

root/etc/s6-overlay/s6-rc.d/svc-tailscale/run → root/etc/s6-overlay/s6-rc.d/svc-mod-tailscale/run

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 FLAGS=""
 

root/etc/s6-overlay/s6-rc.d/svc-mod-tailscale/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/svc-mod-tailscale/run