From 3f17d08b041ddf165d8fe2b5efeaaec597c5b849 Mon Sep 17 00:00:00 2001 From: Marc Mintel Date: Mon, 26 Jan 2026 23:28:23 +0100 Subject: [PATCH] deploy --- .gitea/workflows/deploy.yml | 40 +++++-------------------------------- 1 file changed, 5 insertions(+), 35 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index ce21afdb..4dd957d3 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -118,7 +118,7 @@ jobs: echo "" echo "๐Ÿš€ Starting deployment process..." echo " Target Server: alpha.mintel.me" - echo " Deploy User: deploy" + echo " Deploy User: deploy (via sudo from root)" echo " Target Path: /home/deploy/sites/klz-cables.com" echo "" @@ -142,44 +142,14 @@ jobs: echo "โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”" echo "" - # Execute deployment with proper command chaining - use bash directly to bypass .bashrc exit + # SSH as root and use sudo to run deployment script as deploy user + # This works around the broken SSH output issue with deploy user ssh -o StrictHostKeyChecking=accept-new \ -o ServerAliveInterval=30 \ -o ServerAliveCountMax=3 \ -o ConnectTimeout=10 \ - -o LogLevel=ERROR \ - deploy@alpha.mintel.me \ - "bash --noprofile --norc -c 'set -ex && \ - echo 'โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”' && \ - echo '๐Ÿ“ก Remote Deployment Started' && \ - echo 'โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”' && \ - echo '' && \ - echo '๐Ÿ” Logging into registry on remote server...' && \ - echo '${{ secrets.REGISTRY_PASS }}' | docker login registry.infra.mintel.me -u '${{ secrets.REGISTRY_USER }}' --password-stdin && \ - echo 'โœ… Remote registry login completed' && \ - echo '' && \ - echo '๐Ÿ“‚ Changing to deployment directory...' && \ - cd /home/deploy/sites/klz-cables.com && \ - echo 'โœ… Current directory:' && pwd && \ - echo '' && \ - echo '๐Ÿ“ฅ Pulling latest images (Explicit Pull)...' && \ - docker pull registry.infra.mintel.me/mintel/klz-cables.com:latest && \ - echo 'โœ… Image pull completed' && \ - echo '' && \ - echo '๐Ÿ”„ Starting containers with pull and force-recreate...' && \ - docker compose up -d --pull always --force-recreate --remove-orphans && \ - echo 'โœ… Containers started' && \ - echo '' && \ - echo '๐Ÿงน Cleaning up old images...' && \ - docker image prune -f && \ - echo 'โœ… Cleanup completed' && \ - echo '' && \ - echo '๐Ÿ“Š Container Status:' && \ - docker compose ps && \ - echo '' && \ - echo 'โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”' && \ - echo 'โœ… Remote Deployment Completed Successfully' && \ - echo 'โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”''" + root@alpha.mintel.me \ + "sudo -u deploy /home/deploy/deploy.sh" DEPLOY_EXIT_CODE=$? echo ""