From cf6f68c31cb762fcef5ce975fd90d98c9cfc00b1 Mon Sep 17 00:00:00 2001
From: Elewyn <ph.elewyn@gmail.com>
Date: Thu, 30 Apr 2026 16:42:57 +0200
Subject: [PATCH] fix: sync CI/CD fixes from dev to main

---
 .forgejo/workflows/deploy.yml | 29 ++++++++++++++---------------
 docker-compose.yml            |  3 ---
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml
index a7b16f9..d52df6c 100644
--- a/.forgejo/workflows/deploy.yml
+++ b/.forgejo/workflows/deploy.yml
@@ -8,8 +8,13 @@ jobs:
   deploy:
     runs-on: self-hosted
     steps:
+      - name: Install dependencies
+        run: apk add --no-cache rsync openssh-client
+
       - name: Checkout
-        uses: actions/checkout@v4
+        run: |
+          git clone --depth 1 --branch ${{ github.ref_name }} \
+            ${{ github.server_url }}/${{ github.repository }}.git .
 
       - name: Set deployment path
         run: |
@@ -23,29 +28,23 @@ jobs:
 
       - name: Configure SSH
         run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.NAS_SSH_KEY }}" > ~/.ssh/id_deploy
-          chmod 600 ~/.ssh/id_deploy
-          cat >> ~/.ssh/config << 'EOF'
-          Host nas
-            HostName 192.168.1.208
-            User Elewyn
-            IdentityFile ~/.ssh/id_deploy
-            StrictHostKeyChecking no
-          EOF
+          mkdir -p /root/.ssh
+          echo "${{ secrets.NAS_SSH_KEY }}" > /root/.ssh/id_deploy
+          chmod 600 /root/.ssh/id_deploy
 
       - name: Sync files to NAS
         run: |
           rsync -av --delete \
+            -e "ssh -i /root/.ssh/id_deploy -o StrictHostKeyChecking=no" \
             --exclude='.git' \
             --exclude='.env' \
             --exclude='data/' \
             --exclude='screenshots/' \
             --exclude='logs/' \
-            ./ nas:${{ env.DEPLOY_PATH }}/
+            ./ Elewyn@192.168.1.208:${{ env.DEPLOY_PATH }}/
 
       - name: Restart bot on NAS
         run: |
-          ssh nas "cd ${{ env.DEPLOY_PATH }} && \
-            docker compose down || true && \
-            docker compose up --build -d"
+          ssh -i /root/.ssh/id_deploy -o StrictHostKeyChecking=no \
+            Elewyn@192.168.1.208 \
+            "cd ${{ env.DEPLOY_PATH }} && /share/CACHEDEV1_DATA/.qpkg/container-station/usr/bin/docker compose down || true && /share/CACHEDEV1_DATA/.qpkg/container-station/usr/bin/docker compose up -d"
diff --git a/docker-compose.yml b/docker-compose.yml
index 63c3d5b..ebcdc5c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   discord-bot:
     build: .
@@ -15,7 +13,6 @@ services:
       - ./logs:/app/logs
     environment:
       - TZ=Europe/Paris
-    container_name: rtf-discord-bot
     deploy:
       resources:
         limits: