fix(ci): keep im deploy scoped to service

2026-10-20 17:56:31 +08:00
parent 9c10862a6d
commit 93a6ff0d03
2 changed files with 6 additions and 28 deletions
@@ -67,31 +67,3 @@ jobs:
            "docker login git.olns.shop -u admin --password-stdin"
          ssh "${SSH_ARGS[@]}" "$DEPLOY_USER@$DEPLOY_HOST" \
            "cd /opt/olns && docker compose pull im-server && docker compose up -d --no-deps --wait im-server"
-
-      - name: Ensure production IM CORS routing
-        env:
-          DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
-          DEPLOY_KNOWN_HOSTS: ${{ secrets.DEPLOY_KNOWN_HOSTS }}
-        run: |
-          set -euo pipefail
-          install -d -m 700 "$HOME/.ssh"
-          KEY_FILE="$(mktemp "$HOME/.ssh/olns-cors.XXXXXX")"
-          cleanup() {
-            shred -u "$KEY_FILE" 2>/dev/null || true
-          }
-          trap cleanup EXIT
-          printf '%s\n' "$DEPLOY_SSH_KEY" > "$KEY_FILE"
-          chmod 600 "$KEY_FILE"
-          printf '%s\n' "$DEPLOY_KNOWN_HOSTS" > "$HOME/.ssh/known_hosts"
-          chmod 600 "$HOME/.ssh/known_hosts"
-          SSH_ARGS=(-i "$KEY_FILE" -o BatchMode=yes -o StrictHostKeyChecking=yes)
-          ssh "${SSH_ARGS[@]}" "$DEPLOY_USER@$DEPLOY_HOST" '
-            set -euo pipefail
-            cd /opt/olns
-            cp Caddyfile "config-backups/Caddyfile.$(date -u +%Y%m%dT%H%M%SZ).before-im-cors"
-            perl -0pi -e '"'"'s/\n[ \t]*header \{\n[ \t]*Access-Control-Allow-Origin "https:\/\/im\.yuexuan\.shop"\n[ \t]*Vary "Origin"\n[ \t]*\}\n/\n/'"'"' Caddyfile
-            count="$(grep -A20 -F "im-api.yuexuan.shop {" Caddyfile | grep -Fc '"'"'Access-Control-Allow-Origin "https://im.yuexuan.shop"'"'"' || true)"
-            test "$count" -eq 1
-            docker compose up -d --no-deps --force-recreate caddy
-            docker compose exec -T caddy caddy validate --config /etc/caddy/Caddyfile --adapter caddyfile
-          '