diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 3d8b774e..9fdce021 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -50,38 +50,23 @@ jobs: # --- SSH setup --- - name: Setup SSH - env: - ALPHA_SSH_KEY: ${{ secrets.ALPHA_SSH_KEY }} run: | mkdir -p ~/.ssh - echo "$ALPHA_SSH_KEY" | tr -d '\r' > ~/.ssh/id_deploy + echo "${{ secrets.ALPHA_SSH_KEY }}" > ~/.ssh/id_deploy chmod 600 ~/.ssh/id_deploy - cat >> ~/.ssh/config <> ~/.ssh/known_hosts - # --- Sync compose (yml OR yaml) --- - - name: Sync compose file + # --- Sync files --- + - name: Sync files to server run: | - ssh alpha "mkdir -p /home/deploy/sites/klz-cables.com/" - scp ./docker-compose.y*ml alpha:/home/deploy/sites/klz-cables.com/ - - # --- Sync varnish config (optional) --- - - name: Sync varnish config - run: | - if [ -d ./varnish ]; then - ssh alpha "mkdir -p /home/deploy/sites/klz-cables.com/varnish/" - scp -r ./varnish/* alpha:/home/deploy/sites/klz-cables.com/varnish/ - fi + tar czf - docker-compose.y*ml $([ -d ./varnish ] && echo varnish) | \ + ssh -i ~/.ssh/id_deploy -o StrictHostKeyChecking=no 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 run: | - ssh alpha ' + ssh -i ~/.ssh/id_deploy -o StrictHostKeyChecking=no 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 &&