From 2087001ecd686b01755b5af5dcf85caf08e680c7 Mon Sep 17 00:00:00 2001 From: parsa aghaei Date: Mon, 26 Oct 2026 12:57:29 +0330 Subject: [PATCH] fix(ci): restore original working deploy.yml and direct deploy.sh from eb17c8e284 --- .gitea/workflows/deploy.yml | 34 +++-- scripts/deploy.sh | 279 ++++++++++++++++++++---------------- 2 files changed, 168 insertions(+), 145 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 2d6713a2..75ed8358 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -10,25 +10,23 @@ jobs: deploy: runs-on: canina steps: - - name: Authenticated immutable host deployment (Production acceptance gated) - shell: bash + - name: Run deploy.sh from within the scripts folder env: BRANCH: ${{ github.ref_name }} - DEPLOY_SHA: ${{ github.sha }} - DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }} - DEPLOY_KNOWN_HOSTS: ${{ secrets.DEPLOY_KNOWN_HOSTS }} + SUPPORT_CHAT_KEY: ${{ secrets.SUPPORT_CHAT_KEY }} run: | - set -euo pipefail - set +x - [[ "${BRANCH}" == develop || "${BRANCH}" == main ]] || exit 2 - [[ "${DEPLOY_SHA}" =~ ^[0-9a-f]{40}$ ]] || exit 2 - # Provision DEPLOY_KNOWN_HOSTS from an independently verified host key. - # Never use baked-in /opt/services, runner SSH keys or docker.sock. - [[ -n "${DEPLOY_KEY}" && -n "${DEPLOY_KNOWN_HOSTS}" ]] || { echo 'Host boundary requires DEPLOY_KEY and verified DEPLOY_KNOWN_HOSTS' >&2; exit 2; } - export http_proxy="" https_proxy="" HTTP_PROXY="" HTTPS_PROXY="" + # 1. رفع مشکل DNS و غیرفعال کردن پروکسی برای دامنه محلی + echo "87.248.133.138 git.parsaaghayi.ir" >> /etc/hosts + export http_proxy="" + export https_proxy="" + export HTTP_PROXY="" + export HTTPS_PROXY="" export no_proxy="git.parsaaghayi.ir,localhost,127.0.0.1,87.248.133.138" - umask 077 - wrapper=$(mktemp) - trap 'rm -f "$wrapper"' EXIT - wget --no-proxy -qO "$wrapper" "https://git.parsaaghayi.ir/parsa/canina/raw/commit/${DEPLOY_SHA}/scripts/ci-host-deploy.sh" - bash "$wrapper" + + # 2. دانلود و اجرای اسکریپت deploy.sh بر اساس برنچ جاری + mkdir -p scripts + wget --no-proxy -qO scripts/deploy.sh https://git.parsaaghayi.ir/parsa/canina/raw/branch/${BRANCH}/scripts/deploy.sh + + chmod +x scripts/deploy.sh + cd scripts + ./deploy.sh ${BRANCH} diff --git a/scripts/deploy.sh b/scripts/deploy.sh index dc7268f3..11d3d3c9 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -1,134 +1,159 @@ #!/bin/bash -set -euo pipefail -set +x -# CI-only boundary: main is a code-only immutable promotion with private receipt. -if [ "${GITHUB_ACTIONS:-${GITEA_ACTIONS:-}}" != true ] || [[ "${1:-}" != develop && "${1:-}" != main ]] || [ "$#" != 1 ]; then - echo 'ERROR: refusing deployment outside authenticated CI/CD rollout' >&2 - exit 2 +set -e + +# Explicit no-data-write stage rollout. Run only after testing and pushing HEAD. +if [ "${2:-}" = "stage-backend-only" ]; then + [ "${1:-}" = "develop" ] || exit 2 + cd /opt/services/canina/stage + exec 9>/opt/services/canina/stage-backend-deploy.lock + flock -n 9 || { echo "Stage deployment already in progress"; exit 1; } + [ "$(git branch --show-current)" = develop ] + git fetch origin develop + [ "$(git rev-parse HEAD)" = "$(git rev-parse origin/develop)" ] + git diff --quiet -- backend scripts/compose.stage.yml scripts/deploy.sh + # Read tracked compose directly; preserve generated config and nginx. + docker compose -p stage -f scripts/compose.stage.yml --project-directory . build backend_stage + docker compose -p stage -f scripts/compose.stage.yml --project-directory . up -d --no-deps --remove-orphans backend_stage + exit 0 fi -if [[ ! "${DEPLOY_SHA:-}" =~ ^[0-9a-f]{40}$ ]]; then - echo 'ERROR: refusing deployment without an immutable commit SHA' >&2 - exit 2 + +export DOCKER_BUILDKIT=1 +export COMPOSE_DOCKER_CLI_BUILD=1 + +# Ensure nexus is connected to default bridge network so docker build can reach it +docker network connect bridge nexus 2>/dev/null || true + +# Nexus npm registry +NEXUS_IP=$(docker inspect -f '{{.NetworkSettings.Networks.bridge.IPAddress}}' nexus 2>/dev/null || true) +if [ -z "$NEXUS_IP" ]; then + NEXUS_IP="172.17.0.3" fi -# END ROLLOUT GUARD -if [[ $1 == main ]]; then - umask 077 - helper=$(mktemp) - trap 'rm -f "$helper"' EXIT - wget --no-proxy -qO "$helper" "https://git.parsaaghayi.ir/parsa/canina/raw/commit/${DEPLOY_SHA}/scripts/rollout-production.sh" - bash "$helper" - exit +NPM_REGISTRY="http://${NEXUS_IP}:8081/repository/bitchpedar/" + +BRANCH="${1:-develop}" +echo "Starting Deployment for branch: ${BRANCH}" + +if [ "$BRANCH" == "develop" ]; then + COMPOSE_FILE="compose.stage.yml" + TARGET_DIR="/opt/services/canina/stage" + BACKEND_HOST="backend_stage" + APP_HOST="stage.canina.ir" + ADMIN_HOST="stageadmin.canina.ir" + API_URL="https://stageapi.canina.ir" + CONTAINER_PREFIX="canino_backend_stage" +else + COMPOSE_FILE="compose.prod.yml" + TARGET_DIR="/opt/services/canina/prod" + BACKEND_HOST="backend_prod" + APP_HOST="canina.ir" + ADMIN_HOST="admin.canina.ir" + API_URL="https://api.canina.ir" + CONTAINER_PREFIX="canino_backend_prod" fi -exec 9>/opt/services/canina/stage-backend-deploy.lock -flock -n 9 || { echo 'Stage deployment already in progress' >&2; exit 1; } -umask 077 -export DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 -# Stage is an operational reference, NEVER a checkout/build target. -STAGE_DIR=/opt/services/canina/stage -RELEASE_ROOT=/opt/services/canina/releases -TARGET_DIR="$RELEASE_ROOT/$DEPLOY_SHA" -mkdir -p "$RELEASE_ROOT" -[ ! -L "$RELEASE_ROOT" ] && [ "$(realpath "$RELEASE_ROOT")" = "$RELEASE_ROOT" ] -# Do not overwrite a prior release or retry with stale generated configuration. -mkdir "$TARGET_DIR" -git clone --no-checkout --single-branch --branch develop https://git.parsaaghayi.ir/parsa/canina.git "$TARGET_DIR" + +mkdir -p "$TARGET_DIR" + +if [ ! -d "$TARGET_DIR/.git" ]; then + echo "Cloning repository into $TARGET_DIR..." + git clone -b "$BRANCH" https://git.parsaaghayi.ir/parsa/canina.git "$TARGET_DIR" +else + echo "Pulling latest changes in $TARGET_DIR..." + cd "$TARGET_DIR" + git fetch origin "$BRANCH" + git reset --hard "origin/$BRANCH" + cd - +fi + cd "$TARGET_DIR" -git cat-file -e "${DEPLOY_SHA}^{commit}" -git merge-base --is-ancestor "$DEPLOY_SHA" origin/develop -git sparse-checkout set --no-cone '/*' '!/graphify-out/' -git checkout --detach "$DEPLOY_SHA" -[ "$(git rev-parse HEAD)" = "$DEPLOY_SHA" ] -# Provision against the pristine approved SHA, before any tracked render edits. -source scripts/rollout-stage.sh -if [ "${STAGE_PROVISION_ENABLED:-false}" = true ]; then - stage_runtime_provision -elif [ -e /opt/services/canina/stage-runtime ] && [ "${STAGE_PROVISION_ENABLED:-}" != false ]; then - echo 'ERROR: existing runtime requires explicit Stage CI opt-in on every deploy' >&2 - exit 2 -fi -# Keep operational files out of status/accidental commits in this disposable clone. -printf '\n.support-chat.env\n.revalidation.env\n.stage-base.json\n.stage-compose.json\n.stage-runtime.json\n.stage-runtime-merged.json\n' >> .git/info/exclude -# Runtime secrets/config must never enter the frontend Docker build context. -printf '\n.support-chat.env\n.revalidation.env\n.stage-*.json\n' >> .dockerignore -# Only these backend/frontend runtime env files are required. Do not copy the -# dirty compose, .env, uploads, bot state, certificates, or arbitrary Stage files. -for name in .support-chat.env; do - if [ -e "$STAGE_DIR/$name" ] || [ -L "$STAGE_DIR/$name" ]; then - [ -f "$STAGE_DIR/$name" ] && [ ! -L "$STAGE_DIR/$name" ] - [ -z "$(git -C "$STAGE_DIR" ls-files -- "$name")" ] - [ -z "$(git ls-files -- "$name")" ] - install -m 600 "$STAGE_DIR/$name" "$TARGET_DIR/$name" + +# Capture the bot key from Docker before recreating the bot; runner mounts may not include the host env file. +if docker inspect canina-bot >/dev/null 2>&1; then + LIVE_BOT_KEY=$(docker inspect -f '{{range .Config.Env}}{{println .}}{{end}}' canina-bot | awk -F= '$1 == "SUPPORT_INTERNAL_KEY" {print substr($0, index($0, "=") + 1); exit}') + if [ -n "$LIVE_BOT_KEY" ]; then + grep -v '^SUPPORT_CHAT_KEY=' .support-chat.env > .support-chat.env.tmp 2>/dev/null || true + printf 'SUPPORT_CHAT_KEY=%s\n' "$LIVE_BOT_KEY" >> .support-chat.env.tmp + mv .support-chat.env.tmp .support-chat.env + chmod 600 .support-chat.env fi -done -stage_revalidation_provision -[ -s .support-chat.env ] || { echo 'ERROR: missing Stage support runtime env' >&2; exit 1; } -# Never inspect/recreate/mutate the shared support bot or infer keys from it. -# Certs remain the explicit operational absolute bind from tracked compose. -python3 - <<'PY' -from pathlib import Path -p = Path('nginx.conf') -s = p.read_text() -for key, value in {'__BACKEND_HOST__': 'backend_stage', '__APP_HOST__': 'stage.canina.ir', '__ADMIN_HOST__': 'stageadmin.canina.ir'}.items(): - s = s.replace(key, value) -p.write_text(s) -PY -# Wrapper also covers every compose call in the sourced rollout helper. Explicit -# project/files/env-file prevent release-SHA projects and ambient .env loading. -docker() { - if [ "${1:-}" = compose ]; then - shift - command docker compose -p stage --env-file /dev/null --project-directory "$TARGET_DIR" -f "$TARGET_DIR/.stage-compose.json" "$@" - else - command docker "$@" - fi -} -# Render privately: config contains env secrets, so never emit it to CI logs. -command docker compose -p stage --env-file /dev/null --project-directory "$TARGET_DIR" -f scripts/compose.stage.yml config --format json > .stage-base.json -python3 - <<'PY' -import json -from pathlib import Path -config = json.loads(Path('.stage-base.json').read_text()) -expected = {'canina_stage_db': 'stage_canina_stage_db', 'canina_stage_uploads': 'stage_canina_stage_uploads'} -if set(config['services']) != {'db_stage', 'redis_stage', 'backend_stage', 'frontend_stage'}: - raise SystemExit('ERROR: unexpected Stage service set') -for key, name in expected.items(): - if config['volumes'][key].get('name') != name: - raise SystemExit('ERROR: Stage volume identity mismatch') - config['volumes'][key] = {'name': name, 'external': True} -if config['networks']['traefik_public'].get('name') != 'traefik_public' or not config['networks']['traefik_public'].get('external'): - raise SystemExit('ERROR: Stage network identity mismatch') -backend = config['services']['backend_stage'] -import os -backend['build'].setdefault('args', {})['STAGE_TEST_ARTIFACT_SHA'] = os.environ['DEPLOY_SHA'] -if backend['container_name'] != 'canino_backend_stage' or config['services']['frontend_stage']['container_name'] != 'canino_frontend_stage': - raise SystemExit('ERROR: Stage container identity mismatch') -mounts = backend.get('volumes', []) -if not any(m.get('type') == 'volume' and m.get('source') == 'canina_stage_uploads' and m.get('target') == '/app/uploads' for m in mounts): - raise SystemExit('ERROR: missing Stage uploads volume') -for service in config['services'].values(): - for mount in service.get('volumes', []): - if mount.get('type') == 'bind' and (mount.get('source'), mount.get('target')) != ('/opt/services/proxy/certs/canina', '/app/ssl_certs'): - raise SystemExit('ERROR: unexpected Stage bind mount') -Path('.stage-compose.json').write_text(json.dumps(config)) -Path('.stage-base.json').unlink() -PY -if [ "${STAGE_PROVISION_ENABLED:-false}" = true ]; then - stage_runtime_render + unset LIVE_BOT_KEY fi -# Read-only checks: missing external storage must fail, never provision blank DB. -docker volume inspect stage_canina_stage_db stage_canina_stage_uploads >/dev/null -docker network inspect traefik_public >/dev/null -[ -d /opt/services/proxy/certs/canina ] -# Builds only app images; DB/Redis and support-bot remain untouched. -docker compose --progress plain build backend_stage frontend_stage -source scripts/rollout-stage.sh -# Install reboot-persistent cleanup from this immutable CI release before rollout. -# This preserves the root-private intent journal and fails closed on timer failure. -python3 scripts/install-stage-principal-cleanup.py -stage_rollout -python3 scripts/test-release-retention.py -# Restore only CI-owned render edits after images and acceptance succeed. -git restore -- .dockerignore nginx.conf -python3 scripts/install-disk-watch.py -python3 scripts/release-retention.py --apply --environment stage --current-sha "$DEPLOY_SHA" > /opt/services/canina/tmp/retention-stage.json -echo 'Deployment for develop completed successfully!' + +# Inject support-chat runtime configuration from CI/CD without committing secrets. +# The bot is the runtime owner of the internal key; synchronize only the +# matching value into the colocated backend env file, never into Git or logs. +BOT_ENV="/opt/services/ai/canina-bot/support.env" +if [ -r "$BOT_ENV" ]; then + BOT_KEY=$(awk -F= '$1 == "SUPPORT_INTERNAL_KEY" {print substr($0, index($0, "=") + 1); exit}' "$BOT_ENV") + if [ -n "$BOT_KEY" ]; then + touch .support-chat.env + grep -v '^SUPPORT_CHAT_KEY=' .support-chat.env > .support-chat.env.tmp || true + printf "SUPPORT_CHAT_KEY=%s\n" "$BOT_KEY" >> .support-chat.env.tmp + mv .support-chat.env.tmp .support-chat.env + chmod 600 .support-chat.env + fi + unset BOT_KEY +fi +if [ -n "${SUPPORT_CHAT_KEY:-}" ]; then + touch .support-chat.env + grep -v '^SUPPORT_CHAT_KEY=' .support-chat.env > .support-chat.env.tmp || true + printf 'SUPPORT_CHAT_KEY=%s\n' "$SUPPORT_CHAT_KEY" >> .support-chat.env.tmp + mv .support-chat.env.tmp .support-chat.env + chmod 600 .support-chat.env +fi +if [ ! -s .support-chat.env ]; then + echo "ERROR: missing .support-chat.env / SUPPORT_CHAT_KEY; refusing deployment" >&2 + exit 1 +fi + +# ✅ فایل‌های کانفیگ را از پوشه‌ی scripts مخزن به TARGET_DIR کپی می‌کنیم +echo "Copying configuration files in $TARGET_DIR..." +cp "scripts/$COMPOSE_FILE" "docker-compose.yml" +sed -i 's/- REDIS_PORT: 6379/- REDIS_PORT=6379/g' "docker-compose.yml" 2>/dev/null || true + +echo "Patching nginx.conf for environment..." +sed -i "s/__BACKEND_HOST__/${BACKEND_HOST}/g" "nginx.conf" +sed -i "s/__APP_HOST__/${APP_HOST}/g" "nginx.conf" +sed -i "s/__ADMIN_HOST__/${ADMIN_HOST}/g" "nginx.conf" + +echo "Using Nexus npm proxy: $NPM_REGISTRY" +NPM_REGISTRY_ARG="--build-arg NPM_REGISTRY=${NPM_REGISTRY}" + +echo "Building Docker images..." +docker compose --progress plain build \ + --build-arg NEXT_PUBLIC_API_URL="${API_URL}/api" \ + --build-arg VITE_API_URL="${API_URL}" \ + ${NPM_REGISTRY_ARG} + +echo "Building support-chat bot image from committed source..." +BOT_IMAGE="canina-support-bot:${BRANCH}" +DOCKER_BUILDKIT=0 docker build --pull=false -f scripts/support-chat/Dockerfile -t "${BOT_IMAGE}" . +BOT_ENV="${TARGET_DIR}/.support-bot.runtime.env" +docker inspect -f '{{range .Config.Env}}{{println .}}{{end}}' canina-bot > "${BOT_ENV}" +chmod 600 "${BOT_ENV}" +echo "Starting containers..." +docker compose up -d --remove-orphans +echo "Starting support-chat bot container..." +docker rm -f canina-bot >/dev/null 2>&1 || true +docker run -d --name canina-bot --restart unless-stopped --env-file "${BOT_ENV}" -e HERMES_HOME=/opt/data -e HERMES_RUNTIME_DIR=/opt/hermes/tools -e API_SERVER_HOST=0.0.0.0 -e API_SERVER_PORT=8642 --network traefik_public -v canina_bot_data:/opt/data "${BOT_IMAGE}" gateway run +docker network connect --ip 172.22.0.15 vpn_net canina-bot +rm -f "${BOT_ENV}" +echo "Waiting for backend to start..." +sleep 15 + +# Apply committed Prisma migrations as part of the CI/CD deployment. +# This is intentionally migrate deploy (not db push): it is repeatable, +# fail-closed, and applies only migrations already reviewed and committed. +echo "Applying committed database migrations..." +if [ "$BRANCH" = "main" ]; then + docker exec -e PRISMA_HIDE_UPDATE_MESSAGE=true "${CONTAINER_PREFIX}" npx prisma migrate resolve --applied 20261013210253_add_admin_modules >/dev/null 2>&1 || true +fi +docker exec -e PRISMA_HIDE_UPDATE_MESSAGE=true "${CONTAINER_PREFIX}" npx prisma migrate deploy + +# Code-only deployment: seed and destructive data changes are not performed here. + +# Auto-cleanup old docker builder cache to keep disk healthy (keeps latest 6GB) +echo "Cleaning up old docker build cache..." +docker builder prune -af --keep-storage 6GB 2>/dev/null || true +docker image prune -f 2>/dev/null || true + +echo "Deployment for $BRANCH completed successfully!"