diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 17b71df..4a7c287 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -10,22 +10,9 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - name: Debug runner - run: | - cat /etc/os-release - which apt || which apk || which yum || echo "no package manager found" - - name: Checkout uses: actions/checkout@v4 - - name: Copy files to NAS - run: | - ssh -i ~/.ssh/nas_key -o StrictHostKeyChecking=no root@${{ secrets.NAS_HOST }} \ - "mkdir -p ${{ steps.env.outputs.PROJECT_PATH }}" - tar --exclude='.git' --exclude='node_modules' --exclude='.env' -czf - . | \ - ssh -i ~/.ssh/nas_key -o StrictHostKeyChecking=no root@${{ secrets.NAS_HOST }} \ - "tar -xzf - -C ${{ steps.env.outputs.PROJECT_PATH }}" - - name: Set environment id: env run: | @@ -40,26 +27,24 @@ jobs: - name: Setup SSH key run: | mkdir -p ~/.ssh - echo "${{ secrets.NAS_SSH_KEY }}" > ~/.ssh/nas_key + printf '%s' "${{ secrets.NAS_SSH_KEY }}" > ~/.ssh/nas_key chmod 600 ~/.ssh/nas_key - ssh-keyscan -p 22 ${{ secrets.NAS_HOST }} >> ~/.ssh/known_hosts + ssh-keyscan -p 22 ${{ secrets.NAS_HOST }} >> ~/.ssh/known_hosts 2>/dev/null - name: Copy files to NAS run: | - ssh -i ~/.ssh/nas_key root@${{ secrets.NAS_HOST }} "mkdir -p ${{ steps.env.outputs.PROJECT_PATH }}" - rsync -avz --exclude='.git' --exclude='node_modules' --exclude='.env' \ - -e "ssh -i ~/.ssh/nas_key" \ - ./ root@${{ secrets.NAS_HOST }}:${{ steps.env.outputs.PROJECT_PATH }}/ + ssh -i ~/.ssh/nas_key -o StrictHostKeyChecking=no root@${{ secrets.NAS_HOST }} \ + "mkdir -p ${{ steps.env.outputs.PROJECT_PATH }}" + tar --exclude='.git' --exclude='node_modules' --exclude='.env' -czf - . | \ + ssh -i ~/.ssh/nas_key -o StrictHostKeyChecking=no root@${{ secrets.NAS_HOST }} \ + "tar -xzf - -C ${{ steps.env.outputs.PROJECT_PATH }}" - - name: Copy env file + - name: Setup env file run: | - ssh -i ~/.ssh/nas_key root@${{ secrets.NAS_HOST }} \ + ssh -i ~/.ssh/nas_key -o StrictHostKeyChecking=no root@${{ secrets.NAS_HOST }} \ "cd ${{ steps.env.outputs.PROJECT_PATH }} && cp .env.example .env 2>/dev/null || true" - name: Deploy run: | - ssh -i ~/.ssh/nas_key root@${{ secrets.NAS_HOST }} << 'ENDSSH' - cd ${{ steps.env.outputs.PROJECT_PATH }} - /usr/local/bin/docker compose -f ${{ steps.env.outputs.COMPOSE_FILE }} up -d --build --remove-orphans - /usr/local/bin/docker image prune -f - ENDSSH + ssh -i ~/.ssh/nas_key -o StrictHostKeyChecking=no root@${{ secrets.NAS_HOST }} \ + "cd ${{ steps.env.outputs.PROJECT_PATH }} && /usr/local/bin/docker compose -f ${{ steps.env.outputs.COMPOSE_FILE }} up -d --build --remove-orphans && /usr/local/bin/docker image prune -f"