From d8b268fc2310e3d14e332cd4cf1cd4f2f0d16561 Mon Sep 17 00:00:00 2001
From: Marc Mintel <marc@mintel.me>
Date: Wed, 21 Jan 2026 00:09:52 +0100
Subject: [PATCH] deploy

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

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index a052f2b7..a52f346c 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -10,22 +10,19 @@ jobs:
     runs-on: docker
 
     steps:
+      # --- Checkout ---
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
       # --- Tools ---
       - name: Install tools
         run: |
           apt-get update
           apt-get install -y \
-            git \
             docker.io \
             openssh-client \
             rsync
 
-      # --- Checkout ---
-      - name: Checkout repo
-        run: |
-          git clone https://git.infra.mintel.me/mmintel/klz-cables.com.git .
-          git checkout main
-
       # --- Docker registry login ---
       - name: Login to registry
         env:
@@ -61,16 +58,29 @@ jobs:
         run: |
           # Use IPQoS=0x00 to prevent connection drops in some network environments
           # Use tar to bundle files and send them via SSH in a single connection
-          tar czf - docker-compose.y*ml $([ -d ./varnish ] && echo varnish) | \
+          tar czf - docker-compose.yml $([ -d ./varnish ] && echo varnish) | \
           ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 deploy@alpha.mintel.me \
           "mkdir -p /home/deploy/sites/klz-cables.com/ && tar xzf - -C /home/deploy/sites/klz-cables.com/"
 
       # --- Deploy ---
       - name: Deploy on server
+        env:
+          REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
+          REGISTRY_PASS: ${{ secrets.REGISTRY_PASS }}
         run: |
-          ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 deploy@alpha.mintel.me '
-            cd /home/deploy/sites/klz-cables.com &&
-            (docker compose -f docker-compose.yml pull 2>/dev/null || docker compose -f docker-compose.yaml pull) &&
-            docker image prune -f &&
+          ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 deploy@alpha.mintel.me "
+            set -e
+            echo 'Logging in to registry on server...'
+            echo '$REGISTRY_PASS' | docker login registry.infra.mintel.me -u '$REGISTRY_USER' --password-stdin
+            
+            cd /home/deploy/sites/klz-cables.com
+            
+            echo 'Pulling latest images...'
+            docker compose pull
+            
+            echo 'Updating containers...'
             docker compose up -d
-          '
+            
+            echo 'Pruning old images...'
+            docker image prune -f
+          "