From 505c19eb8ac891a3884b790e499b7f680915dd08 Mon Sep 17 00:00:00 2001
From: "Gan, Jimmy" <jimmy.gan@adidas.com>
Date: Thu, 9 Jul 2026 23:18:16 +0800
Subject: [PATCH] fix CI: single step using existing /volume1/docker/t-youtube
 repo

---
 .gitea/workflows/deploy.yml | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 57290af..134e782 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -14,18 +14,13 @@ jobs:
     name: Build & Deploy
     runs-on: nas
     steps:
-      - name: Checkout
+      - name: Pull & Build & Deploy
         run: |
-          rm -rf /volume1/docker/t-youtube-build
-          git clone --depth=1 http://localhost:3300/jimmy/t-youtube.git /volume1/docker/t-youtube-build 2>&1
-
-      - name: Build Docker image
-        run: |
-          cd /volume1/docker/t-youtube-build
+          set -e
+          cd /volume1/docker/t-youtube
+          git fetch origin main 2>&1
+          git merge FETCH_HEAD 2>&1
           /volume1/@appstore/ContainerManager/usr/bin/docker build -t t-youtube:latest . 2>&1
-
-      - name: Swap container
-        run: |
           D=/volume1/@appstore/ContainerManager/usr/bin
           $D/docker stop t-youtube 2>/dev/null || true
           $D/docker rm t-youtube 2>/dev/null || true
@@ -35,15 +30,11 @@ jobs:
             -v /volume1/docker/t-youtube/data:/app/data \
             -v /volume1/docker/t-youtube/config:/app/config \
             t-youtube:latest 2>&1
-          rm -rf /volume1/docker/t-youtube-build
-
-      - name: Verify
-        run: |
-          sleep 5
-          D=/volume1/@appstore/ContainerManager/usr/bin
+          sleep 3
           STATUS=$($D/docker ps --filter name=t-youtube --format "{{.Status}}")
           echo "Container: $STATUS"
           if ! echo "$STATUS" | grep -q "Up"; then
+            echo "Container failed to start"
             $D/docker logs t-youtube --tail 20
             exit 1
           fi