From af47025893aac0bdffdffabb85f50624460f05fd Mon Sep 17 00:00:00 2001 From: Youssef Date: Thu, 3 Sep 2026 13:16:03 +0200 Subject: [PATCH] refactor(ci): mount host .ssh directory directly in docker step container --- .gitea/workflows/ci-prod.yml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/.gitea/workflows/ci-prod.yml b/.gitea/workflows/ci-prod.yml index 77dfbe1..e17753e 100644 --- a/.gitea/workflows/ci-prod.yml +++ b/.gitea/workflows/ci-prod.yml @@ -120,33 +120,22 @@ jobs: DB_SERVER_HOST: ${{ secrets.PROD_DB_HOST }} DB_SERVER_USER: ${{ secrets.PROD_DB_SSH_USER }} REMOTE_PORT: ${{ secrets.REMOTE_PORT }} - PROD_DB_SSH_KEY: ${{ secrets.PROD_DB_SSH_KEY }} - SSH_KEY_PATH_SECRET: ${{ secrets.SSH_KEY_PATH }} - SSH_KEY_SECRET: ${{ secrets.SSH_KEY }} run: | TARGET_HOST="${DB_SERVER_HOST:-10.8.0.3}" TARGET_USER="${DB_SERVER_USER:-root}" PORT="${REMOTE_PORT:-22}" DEST_DIR="/opt/as-talange" - KEY_CONTENT="${PROD_DB_SSH_KEY:-${SSH_KEY_PATH_SECRET:-${SSH_KEY_SECRET}}}" - docker run --rm --net=host -v "$(pwd):/workspace" -w /workspace \ + docker run --rm --net=host \ + -v "$(pwd):/workspace" -w /workspace \ + -v "${HOME}/.ssh:/root/.ssh:ro" \ -e TARGET_HOST="${TARGET_HOST}" \ -e TARGET_USER="${TARGET_USER}" \ -e PORT="${PORT}" \ -e DEST_DIR="${DEST_DIR}" \ - -e KEY_CONTENT="${KEY_CONTENT}" \ alpine:latest sh -c ' apk add --no-cache openssh-client rsync && \ - if [ -n "$KEY_CONTENT" ]; then \ - mkdir -p ~/.ssh && \ - printf "%s\n" "$KEY_CONTENT" | tr -d "\r" > ~/.ssh/id_rsa && \ - echo "" >> ~/.ssh/id_rsa && \ - chmod 600 ~/.ssh/id_rsa ; \ - elif [ -f /root/.ssh/id_rsa ]; then \ - mkdir -p ~/.ssh && cp /root/.ssh/id_rsa ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa ; \ - fi && \ - SSH_CMD="ssh -p ${PORT} -i ~/.ssh/id_rsa -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o ConnectTimeout=15" && \ + SSH_CMD="ssh -p ${PORT} -o StrictHostKeyChecking=no -o ConnectTimeout=15" && \ echo "Deploying backup script and .env to DB Server (${TARGET_USER}@${TARGET_HOST}:${DEST_DIR})..." && \ $SSH_CMD "${TARGET_USER}@${TARGET_HOST}" "mkdir -p ${DEST_DIR}/scripts" && \ rsync -avz -e "$SSH_CMD" scripts/backup_db.sh "${TARGET_USER}@${TARGET_HOST}:${DEST_DIR}/scripts/" && \