From 6db672a56e594b3d209faf8f5b8e150e3279d0de Mon Sep 17 00:00:00 2001
From: "Gan, Jimmy" <jimmy.gan@adidas.com>
Date: Mon, 6 Apr 2026 20:48:44 +0800
Subject: [PATCH] fix: revert to runs-on: ubuntu-latest (the working
 configuration)

The runner was always configured with ubuntu-latest label, not nas.
Using ubuntu-latest with Docker-in-Docker works because runner has
/volume1/docker/nas-dashboard in valid_volumes.

Also keep the network creation fix to prevent duplicates.
---
 .gitea/workflows/deploy-dev.yml | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml
index 1b2796f..d47c61d 100644
--- a/.gitea/workflows/deploy-dev.yml
+++ b/.gitea/workflows/deploy-dev.yml
@@ -12,17 +12,12 @@ concurrency:
 
 jobs:
   deploy-dev:
-    runs-on: nas
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        run: |
-          # Clone into a temp directory accessible by runner
-          WORK_DIR="/tmp/nas-tools-deploy-$$"
-          rm -rf "$WORK_DIR"
-          git clone http://gitea:3000/jimmy/nas-tools.git "$WORK_DIR"
-          cd "$WORK_DIR"
-          git checkout ${{ github.sha }}
-          echo "WORK_DIR=$WORK_DIR" >> $GITHUB_ENV
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.sha }}
       - name: Warm mirror cache for base images
         run: |
           set -u
@@ -55,13 +50,12 @@ jobs:
 
       - name: Build dev image
         run: |
-          cd $WORK_DIR
           export DOCKER_API_VERSION=1.43
           DOCKER_BUILDKIT=0 docker build --cache-from nas-dashboard-dev:latest -t nas-dashboard-dev:latest dashboard/
       - name: Sync runtime compose file
         run: |
           mkdir -p /volume1/docker/nas-dashboard
-          cp $WORK_DIR/dashboard/docker-compose.dev.yml /volume1/docker/nas-dashboard/docker-compose.dev.yml
+          cp dashboard/docker-compose.dev.yml /volume1/docker/nas-dashboard/docker-compose.dev.yml
       - name: Deploy dev
         run: |
           set -euo pipefail
@@ -78,13 +72,9 @@ jobs:
           fi
 
           # Use a dedicated project name to avoid killing production (which is project 'nas-dashboard')
-          # and deploy using the synced compose file.
+          # and deploy using theSynced compose file.
           docker compose -f docker-compose.dev.yml -p nas-dashboard-dev down --remove-orphans || true
           docker compose -f docker-compose.dev.yml -p nas-dashboard-dev up -d --build --pull never
 
           # Connect to gitea_gitea network for database access (OPC_DB)
           docker network connect gitea_gitea nas-dashboard-dev || true
-      - name: Cleanup
-        if: always()
-        run: |
-          rm -rf $WORK_DIR