From 3a75c6907ca5ea88b9abb7b4fcf187d5d92c98e9 Mon Sep 17 00:00:00 2001
From: Rogier Lommers <rlommers@lmac-pw25mjwtxx.taileea20.ts.net>
Date: Wed, 3 Jan 2024 17:11:06 +0100
Subject: [PATCH] Fix github actions

---
 .github/workflows/docker-image.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index c6772b1..f3b8caf 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -64,17 +64,16 @@ jobs:
     name: "Pull latest image and run"
     runs-on: ubuntu-latest
     needs: build-and-push-image
-    # inspiration: https://blog.benoitblanchon.fr/github-action-run-ssh-commands/
+
     steps:
 
+      # More info: https://github.com/tailscale/github-action
       - name: Tailscale
-        uses: tailscale/github-action@main
+        uses: tailscale/github-action@v2
         with:
-          authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
-          version: 1.36.2
-          # get keys here: https://login.tailscale.com/admin/settings/keys
-          # these will expire after 90 days
-          # be sure to enable reusable and ephemeral
+          oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
+          oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
+          tags: tag:ci
 
       - name: Configure SSH
         run: |
@@ -83,7 +82,7 @@ jobs:
           chmod 600 ~/.ssh/ssh.key
           cat >>~/.ssh/config <<END
           Host services
-            HostName $(tailscale ip -6 services)
+            HostName $(tailscale ip -4 services)
             User $SSH_USER
             IdentityFile ~/.ssh/ssh.key
             StrictHostKeyChecking no