deploy

.gitea/workflows/deploy.yml

@@ -54,30 +54,35 @@ jobs:
           ALPHA_SSH_KEY: ${{ secrets.ALPHA_SSH_KEY }}
         run: |
           mkdir -p ~/.ssh
-          echo "$ALPHA_SSH_KEY" > ~/.ssh/id_ed25519
+          echo "$ALPHA_SSH_KEY" | tr -d '\r' > ~/.ssh/id_deploy
-          chmod 600 ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_deploy
-          ssh-keyscan -H alpha.mintel.me >> ~/.ssh/known_hosts
+          cat >> ~/.ssh/config <<EOF
+          Host alpha
+            HostName alpha.mintel.me
+            User deploy
+            IdentityFile ~/.ssh/id_deploy
+            StrictHostKeyChecking no
+          EOF
 
       # --- Sync compose (yml OR yaml) ---
       - name: Sync compose file
         run: |
-          rsync -av ./docker-compose.y*ml \
+          ssh alpha "mkdir -p /home/deploy/sites/klz-cables.com/"
-            deploy@alpha.mintel.me:/home/deploy/sites/klz-cables.com/
+          rsync -avz ./docker-compose.y*ml alpha:/home/deploy/sites/klz-cables.com/
 
       # --- Sync varnish config (optional) ---
       - name: Sync varnish config
         run: |
           if [ -d ./varnish ]; then
-            rsync -av ./varnish/ deploy@alpha.mintel.me:/home/deploy/sites/klz-cables.com/varnish/
+            rsync -avz ./varnish/ alpha:/home/deploy/sites/klz-cables.com/varnish/
           fi
 
       # --- Deploy ---
       - name: Deploy on server
         run: |
-          ssh deploy@alpha.mintel.me '
+          ssh alpha '
             cd /home/deploy/sites/klz-cables.com &&
-            docker compose -f docker-compose.yml pull 2>/dev/null ||
+            (docker compose -f docker-compose.yml pull 2>/dev/null || docker compose -f docker-compose.yaml pull) &&
-            docker compose -f docker-compose.yaml pull &&
             docker image prune -f &&
             docker compose up -d
           '