From f6f7352c0dcca9d3bf02389537e17b9f01296935 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 4 Jul 2026 01:35:43 -0400 Subject: [PATCH] fix build --- .gitea/workflows/build-and-deploy.yml | 44 ++++++++++++++++----------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index ab9f5ac..3bbe72a 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -124,7 +124,7 @@ jobs: env: VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-$DEPLOY_REGISTRY_HOST}" + VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" if [ -z "${{ secrets.VPS_SSH_KEY }}" ] || \ [ -z "$VPS_HOST" ] || \ [ -z "${{ secrets.VPS_USER }}" ]; then @@ -143,11 +143,13 @@ jobs: env: VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-$DEPLOY_REGISTRY_HOST}" + VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" + echo "Using SSH host $VPS_HOST" mkdir -p ~/.ssh && chmod 700 ~/.ssh echo "${{ secrets.VPS_SSH_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - ssh-keyscan -H "$VPS_HOST" >> ~/.ssh/known_hosts 2>/dev/null + touch ~/.ssh/known_hosts + ssh-keyscan -H "$VPS_HOST" >> ~/.ssh/known_hosts 2>/dev/null || true chmod 644 ~/.ssh/known_hosts - name: Sync build context to VPS @@ -155,8 +157,9 @@ jobs: REMOTE_BUILD_DIR: ${{ env.DEPLOY_ROOT }}/build-context VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-$DEPLOY_REGISTRY_HOST}" - ssh "${{ secrets.VPS_USER }}@$VPS_HOST" \ + VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" + SSH_OPTIONS="-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=$HOME/.ssh/known_hosts" + ssh $SSH_OPTIONS "${{ secrets.VPS_USER }}@$VPS_HOST" \ "rm -rf '$REMOTE_BUILD_DIR' && mkdir -p '$REMOTE_BUILD_DIR'" tar \ --exclude='.git' \ @@ -164,7 +167,7 @@ jobs: --exclude='.next' \ --exclude='dist' \ --exclude='coverage' \ - -czf - . | ssh "${{ secrets.VPS_USER }}@$VPS_HOST" \ + -czf - . | ssh $SSH_OPTIONS "${{ secrets.VPS_USER }}@$VPS_HOST" \ "tar -xzf - -C '$REMOTE_BUILD_DIR'" - name: Build and push on VPS @@ -183,9 +186,10 @@ jobs: REMOTE_BUILD_DIR: ${{ env.DEPLOY_ROOT }}/build-context VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-$DEPLOY_REGISTRY_HOST}" + VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" + SSH_OPTIONS="-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=$HOME/.ssh/known_hosts" REGISTRY_PASSWORD_B64="$(printf '%s' "$REGISTRY_PASSWORD" | base64 | tr -d '\n')" - ssh "${{ secrets.VPS_USER }}@$VPS_HOST" " + ssh $SSH_OPTIONS "${{ secrets.VPS_USER }}@$VPS_HOST" " set -e cd '$REMOTE_BUILD_DIR' if ! command -v docker >/dev/null 2>&1; then @@ -271,7 +275,7 @@ jobs: env: VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-$DEPLOY_REGISTRY_HOST}" + VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" if [ -z "${{ secrets.VPS_SSH_KEY }}" ] || \ [ -z "$VPS_HOST" ] || \ [ -z "${{ secrets.VPS_USER }}" ]; then @@ -294,11 +298,13 @@ jobs: env: VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-$DEPLOY_REGISTRY_HOST}" + VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" + echo "Using SSH host $VPS_HOST" mkdir -p ~/.ssh && chmod 700 ~/.ssh echo "${{ secrets.VPS_SSH_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - ssh-keyscan -H "$VPS_HOST" >> ~/.ssh/known_hosts 2>/dev/null + touch ~/.ssh/known_hosts + ssh-keyscan -H "$VPS_HOST" >> ~/.ssh/known_hosts 2>/dev/null || true chmod 644 ~/.ssh/known_hosts - name: Sync deployment assets @@ -306,21 +312,22 @@ jobs: env: VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-$DEPLOY_REGISTRY_HOST}" - ssh "${{ secrets.VPS_USER }}@$VPS_HOST" \ + VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" + SSH_OPTIONS="-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=$HOME/.ssh/known_hosts" + ssh $SSH_OPTIONS "${{ secrets.VPS_USER }}@$VPS_HOST" \ "mkdir -p '$DEPLOY_ROOT/scripts' '$DEPLOY_ROOT/docker/pgmanage' '$DEPLOY_ROOT/docker/registry/auth' '$DEPLOY_ROOT/dynamic'" - scp docker-compose.production.yml \ + scp $SSH_OPTIONS docker-compose.production.yml \ docker-compose.portainer.production.yml \ docker-compose.registry.production.yml \ docker-compose.registry.local.yml \ traefik.yaml \ "${{ secrets.VPS_USER }}@$VPS_HOST:$DEPLOY_ROOT/" - scp scripts/docker-prod-common.sh \ + scp $SSH_OPTIONS scripts/docker-prod-common.sh \ scripts/docker-prod-deploy.sh \ scripts/docker-prod-up-registry.sh \ scripts/docker-registry-local-up.sh \ "${{ secrets.VPS_USER }}@$VPS_HOST:$DEPLOY_ROOT/scripts/" - scp docker/pgmanage/override.py \ + scp $SSH_OPTIONS docker/pgmanage/override.py \ "${{ secrets.VPS_USER }}@$VPS_HOST:$DEPLOY_ROOT/docker/pgmanage/" - name: Run deploy script on VPS @@ -328,9 +335,10 @@ jobs: env: VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-$DEPLOY_REGISTRY_HOST}" + VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" + SSH_OPTIONS="-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=$HOME/.ssh/known_hosts" REGISTRY_PASSWORD_B64="$(printf '%s' "${{ secrets.REGISTRY_PASSWORD }}" | base64 | tr -d '\n')" - ssh "${{ secrets.VPS_USER }}@$VPS_HOST" " + ssh $SSH_OPTIONS "${{ secrets.VPS_USER }}@$VPS_HOST" " set -e cd '$DEPLOY_ROOT' APP_IMAGE='$DEPLOY_REGISTRY_HOST/$IMAGE_REPOSITORY' \