From 385c98939af342097c2e340fef8946cdd5149bbd Mon Sep 17 00:00:00 2001
From: Stephan D <sdeshevikh@yandex.ru>
Date: Fri, 7 Nov 2025 11:03:18 +0100
Subject: [PATCH] removed debug output

---
 .woodpecker/db.yml           |  6 ++---
 ci/prod/scripts/deploy-db.sh | 51 ++++++++++++++++++++----------------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/.woodpecker/db.yml b/.woodpecker/db.yml
index a3336b9..c02526e 100644
--- a/.woodpecker/db.yml
+++ b/.woodpecker/db.yml
@@ -32,20 +32,18 @@ steps:
     image: alpine:latest
     depends_on: [ secrets ]
     commands:
-      - set -Eeuxo pipefail
+      - set -euo pipefail
       - apk add --no-cache bash openssh-client rsync coreutils
       - mkdir -p /root/.ssh
       - install -m 600 secrets/SSH_KEY /root/.ssh/id_rsa
-      # страхуемся от CRLF в env-файле
       - sed -i 's/\r$//' ./ci/prod/.env.runtime
-      # поднимаем переменные для скрипта
       - set -a
       - . ./ci/prod/.env.runtime
       - . ./.env.version
       - set +a
-      # просто запускаем внешний скрипт
       - bash ci/prod/scripts/deploy-db.sh
 
 
 
 
+
diff --git a/ci/prod/scripts/deploy-db.sh b/ci/prod/scripts/deploy-db.sh
index 534723b..5016a55 100755
--- a/ci/prod/scripts/deploy-db.sh
+++ b/ci/prod/scripts/deploy-db.sh
@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
-set -Eeuo pipefail
-trap 'echo "[deploy-db] failed at line $LINENO"; exit 1' ERR
+set -euo pipefail
+# Enable verbose mode only when DEBUG_DEPLOY=1
+[[ "${DEBUG_DEPLOY:-0}" = "1" ]] && set -x
+trap 'echo "[deploy-db] error at line $LINENO" >&2' ERR
 
-# Требуем ключевые переменные уже ПРОБРОШЕННЫЕ из шага CI
+# Required environment variables (must be exported by the CI step)
 : "${REMOTE_BASE:?missing REMOTE_BASE}"
 : "${DB_DIR:?missing DB_DIR}"
 : "${SSH_USER:?missing SSH_USER}"
@@ -10,34 +12,37 @@ trap 'echo "[deploy-db] failed at line $LINENO"; exit 1' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${DB_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
-SSH_OPTS=(-i /root/.ssh/id_rsa -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -vv)
 
-echo "[local] REMOTE_DIR=${REMOTE_DIR} REMOTE_TARGET=${REMOTE_TARGET}"
+# SSH options: quiet by default; add -vv in debug mode
+SSH_OPTS=(
+  -i /root/.ssh/id_rsa
+  -o StrictHostKeyChecking=no
+  -o UserKnownHostsFile=/dev/null
+  -o LogLevel=ERROR
+  -q
+)
+if [[ "${DEBUG_DEPLOY:-0}" = "1" ]]; then
+  SSH_OPTS=("${SSH_OPTS[@]/-q/}" -vv)
+fi
 
-# Кто мы на удалёнке (оставляет след в логе CI)
-ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" 'echo "[whoami] $(whoami) @ $(hostname) $(date -Is)"'
+# rsync options: quiet by default; add -v in debug mode
+RSYNC_FLAGS=(-az --delete)
+[[ "${DEBUG_DEPLOY:-0}" = "1" ]] && RSYNC_FLAGS=(-avz --delete)
 
-# Создание директорий и синк
+# Create remote directories and sync files
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
-rsync -avz --delete -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/      "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync -avz             -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/       "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime    "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 
-# Контрольная сумма — доказательство доставки
-local_sum="$(sha256sum ci/prod/compose/db.yml | awk '{print $1}')"
-remote_sum="$(ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "sha256sum ${REMOTE_DIR}/compose/db.yml | awk '{print \$1}'")"
-echo "[sha256] local=$local_sum remote=$remote_sum"
-
-# Деплой на удалёнке (ВАЖНО: 'bash -s', чтобы heredoc выполнился)
+# Deploy on remote host (use 'bash -s' so heredoc is executed remotely)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" REMOTE_DIR="$REMOTE_DIR" bash -s <<'EOSSH'
-set -Eeuxo pipefail
-echo "[remote] whoami=$(whoami) host=$(hostname) pwd=$PWD"
+set -euo pipefail
 cd "${REMOTE_DIR}/compose"
-set -a
-. ../env/.env.runtime
-set +a
-docker compose -f db.yml pull
+set -a; . ../env/.env.runtime; set +a
+# Pull quietly if supported; otherwise fall back to normal
+docker compose -f db.yml pull --quiet 2>/dev/null || docker compose -f db.yml pull
 docker compose -f db.yml up -d --remove-orphans
 docker compose ps
-date -Is | tee .last_deploy
+date -Is > .last_deploy
 logger -t deploy-db "db deployed at $(date -Is) in ${REMOTE_DIR}"
 EOSSH