From b85ebd5df99b4da28f9f490e8f281415e2d199c4 Mon Sep 17 00:00:00 2001
From: Bu5hm4nn <bu5hm4nn@users.noreply.github.com>
Date: Sat, 21 Mar 2026 23:33:26 +0100
Subject: [PATCH] Fix Forgejo hostname resolution: set GITHUB_SERVER_URL to
 reachable address

The runner container cannot resolve 'forgejo' Docker hostname.
Set GITHUB_SERVER_URL to the accessible URL (10.100.0.2:3000).

- Add FORGEJO_URL env var (defaults to http://10.100.0.2:3000)
- Override GITHUB_SERVER_URL for checkout action
- Can be configured via vars.FORGEJO_URL in Forgejo settings
---
 .forgejo/workflows/ci.yaml     |  6 ++++++
 .forgejo/workflows/deploy.yaml | 12 +++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml
index 34815a2..835ca49 100644
--- a/.forgejo/workflows/ci.yaml
+++ b/.forgejo/workflows/ci.yaml
@@ -15,6 +15,8 @@ jobs:
     runs-on: docker
     container:
       image: catthehacker/ubuntu:act-latest
+    env:
+      GITHUB_SERVER_URL: ${{ vars.FORGEJO_URL || 'http://10.100.0.2:3000' }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
@@ -34,6 +36,8 @@ jobs:
     runs-on: docker
     container:
       image: catthehacker/ubuntu:act-latest
+    env:
+      GITHUB_SERVER_URL: ${{ vars.FORGEJO_URL || 'http://10.100.0.2:3000' }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
@@ -51,6 +55,8 @@ jobs:
     runs-on: docker
     container:
       image: catthehacker/ubuntu:act-latest
+    env:
+      GITHUB_SERVER_URL: ${{ vars.FORGEJO_URL || 'http://10.100.0.2:3000' }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index e6bdcb5..8a69b0e 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -8,12 +8,15 @@ on:
 env:
   REGISTRY: ${{ vars.REGISTRY || '10.100.0.2:3000' }}
   IMAGE_NAME: ${{ github.repository }}
+  FORGEJO_URL: ${{ vars.FORGEJO_URL || 'http://10.100.0.2:3000' }}
 
 jobs:
   lint:
     runs-on: docker
     container:
       image: catthehacker/ubuntu:act-latest
+    env:
+      GITHUB_SERVER_URL: ${{ env.FORGEJO_URL }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
@@ -33,6 +36,8 @@ jobs:
     runs-on: docker
     container:
       image: catthehacker/ubuntu:act-latest
+    env:
+      GITHUB_SERVER_URL: ${{ env.FORGEJO_URL }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
@@ -50,6 +55,8 @@ jobs:
     runs-on: docker
     container:
       image: catthehacker/ubuntu:act-latest
+    env:
+      GITHUB_SERVER_URL: ${{ env.FORGEJO_URL }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
@@ -69,6 +76,8 @@ jobs:
     needs: [lint, test, type-check]
     container:
       image: catthehacker/ubuntu:act-latest
+    env:
+      GITHUB_SERVER_URL: ${{ env.FORGEJO_URL }}
     steps:
       - uses: actions/checkout@v4
 
@@ -99,6 +108,7 @@ jobs:
     container:
       image: catthehacker/ubuntu:act-latest
     env:
+      GITHUB_SERVER_URL: ${{ env.FORGEJO_URL }}
       DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
       DEPLOY_USER: ${{ secrets.DEPLOY_USER || 'deploy' }}
       DEPLOY_PORT: ${{ secrets.DEPLOY_PORT || '22' }}
@@ -113,7 +123,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          apt-get update && apt-get install -y bash openssh-client curl docker.io docker-compose
+          apt-get update && apt-get install -y bash openssh-client curl docker.io docker-compose-plugin
           mkdir -p ~/.ssh
           chmod 700 ~/.ssh