Merge pull request 'ci: рендер прод-конфигов через ssh (appleboy ломает heredoc)' (#24) from fix-deploy-render-via-ssh into main
Main: tests, deploy, autotests / java (push) Successful in 45s
Main: tests, deploy, autotests / web (push) Successful in 51s
Main: tests, deploy, autotests / images (push) Successful in 46s
Main: tests, deploy, autotests / deploy (push) Failing after 27s
Main: tests, deploy, autotests / autotests (push) Has been skipped
Main: tests, deploy, autotests / rollback (push) Failing after 15s
Main: tests, deploy, autotests / java (push) Successful in 45s
Main: tests, deploy, autotests / web (push) Successful in 51s
Main: tests, deploy, autotests / images (push) Successful in 46s
Main: tests, deploy, autotests / deploy (push) Failing after 27s
Main: tests, deploy, autotests / autotests (push) Has been skipped
Main: tests, deploy, autotests / rollback (push) Failing after 15s
Reviewed-on: #24
This commit was merged in pull request #24.
This commit is contained in:
+63
-39
@@ -111,8 +111,6 @@ jobs:
|
|||||||
deploy:
|
deploy:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: images
|
needs: images
|
||||||
steps:
|
|
||||||
- name: Check deploy vars and secrets
|
|
||||||
env:
|
env:
|
||||||
DEPLOY_HOST: ${{ vars.DEPLOY_HOST }}
|
DEPLOY_HOST: ${{ vars.DEPLOY_HOST }}
|
||||||
DEPLOY_USER: ${{ vars.DEPLOY_USER }}
|
DEPLOY_USER: ${{ vars.DEPLOY_USER }}
|
||||||
@@ -124,6 +122,8 @@ jobs:
|
|||||||
REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
|
REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
|
||||||
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
WORDPDF_API_KEY: ${{ secrets.WORDPDF_API_KEY }}
|
WORDPDF_API_KEY: ${{ secrets.WORDPDF_API_KEY }}
|
||||||
|
steps:
|
||||||
|
- name: Check deploy vars and secrets
|
||||||
run: |
|
run: |
|
||||||
missing=0
|
missing=0
|
||||||
for v in DEPLOY_HOST DEPLOY_USER DEPLOY_DIR REGISTRY WORDPDF_MAX_MB WORDPDF_MAX_PAGES; do
|
for v in DEPLOY_HOST DEPLOY_USER DEPLOY_DIR REGISTRY WORDPDF_MAX_MB WORDPDF_MAX_PAGES; do
|
||||||
@@ -134,33 +134,14 @@ jobs:
|
|||||||
done
|
done
|
||||||
exit "$missing"
|
exit "$missing"
|
||||||
|
|
||||||
# Единственный источник правды конфигурации прода — этот workflow: docker-compose.yml
|
# Единственный источник правды конфигурации прода — этот workflow: файлы
|
||||||
# и nginx.conf рендерятся на прод-хост на каждый деплой из Variables/Secrets;
|
# рендерятся в workspace runner'а (обычный bash) и переносятся на хост через
|
||||||
# ключ API в файлы не пишется (берётся из окружения job'а). На прод-хосте
|
# ssh — appleboy/ssh-action для этого непригоден: он вставляет свою guard-строку
|
||||||
# конфигурации нет: restart.sh и .env удаляются как наследие ручного setup.
|
# после каждой строки скрипта и срезает отступы, heredoc превращается в мусор
|
||||||
- name: Render prod stack and deploy
|
# (рег. run 482: битый compose на проде, «mapping values are not allowed here»).
|
||||||
env:
|
# Ключ API в файл не пишется: compose интерполирует его из окружения деплоя.
|
||||||
DEPLOY_DIR: ${{ vars.DEPLOY_DIR }}
|
- name: Render prod stack files
|
||||||
DEPLOY_HOST: ${{ vars.DEPLOY_HOST }}
|
run: &render-stack-files |
|
||||||
REGISTRY: ${{ vars.REGISTRY }}
|
|
||||||
WORDPDF_MAX_MB: ${{ vars.WORDPDF_MAX_MB }}
|
|
||||||
WORDPDF_MAX_PAGES: ${{ vars.WORDPDF_MAX_PAGES }}
|
|
||||||
WORDPDF_API_KEY: ${{ secrets.WORDPDF_API_KEY }}
|
|
||||||
REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
|
|
||||||
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
|
||||||
uses: appleboy/ssh-action@v1.0.3
|
|
||||||
with:
|
|
||||||
host: ${{ vars.DEPLOY_HOST }}
|
|
||||||
username: ${{ vars.DEPLOY_USER }}
|
|
||||||
key: ${{ secrets.DEPLOY_SSH_KEY }}
|
|
||||||
script_stop: true
|
|
||||||
envs: DEPLOY_DIR,DEPLOY_HOST,REGISTRY,WORDPDF_MAX_MB,WORDPDF_MAX_PAGES,WORDPDF_API_KEY,REGISTRY_USER,REGISTRY_PASSWORD
|
|
||||||
script: |
|
|
||||||
set -euo pipefail
|
|
||||||
umask 077
|
|
||||||
mkdir -p "$DEPLOY_DIR"
|
|
||||||
cd "$DEPLOY_DIR"
|
|
||||||
rm -f restart.sh .env
|
|
||||||
cat > docker-compose.yml <<COMPOSE
|
cat > docker-compose.yml <<COMPOSE
|
||||||
name: wordpdf-prod
|
name: wordpdf-prod
|
||||||
# Рендерится CI на каждый деплой (Gitea Actions, job deploy в main.yml) —
|
# Рендерится CI на каждый деплой (Gitea Actions, job deploy в main.yml) —
|
||||||
@@ -249,6 +230,28 @@ jobs:
|
|||||||
location / { proxy_pass \$upstream_web; }
|
location / { proxy_pass \$upstream_web; }
|
||||||
}
|
}
|
||||||
NGINX
|
NGINX
|
||||||
|
python3 -c 'import yaml; yaml.safe_load(open("docker-compose.yml"))'
|
||||||
|
|
||||||
|
- name: Upload and deploy
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
command -v ssh >/dev/null 2>&1 || { apt-get update -q && apt-get install -y -q openssh-client; }
|
||||||
|
mkdir -p "$HOME/.ssh" && chmod 700 "$HOME/.ssh"
|
||||||
|
printf '%s\n' "$DEPLOY_SSH_KEY" > "$HOME/.ssh/id_deploy"
|
||||||
|
chmod 600 "$HOME/.ssh/id_deploy"
|
||||||
|
set -- -i "$HOME/.ssh/id_deploy" -o StrictHostKeyChecking=accept-new
|
||||||
|
D=$(printf '%q' "$DEPLOY_DIR")
|
||||||
|
H="$DEPLOY_USER@$DEPLOY_HOST"
|
||||||
|
ssh "$@" "$H" "umask 077; mkdir -p $D && cat > $D/docker-compose.yml" < docker-compose.yml
|
||||||
|
ssh "$@" "$H" "cat > $D/nginx.conf" < nginx.conf
|
||||||
|
{
|
||||||
|
printf 'export DEPLOY_DIR=%q REGISTRY=%q REGISTRY_USER=%q REGISTRY_PASSWORD=%q WORDPDF_API_KEY=%q\n' \
|
||||||
|
"$DEPLOY_DIR" "$REGISTRY" "$REGISTRY_USER" "$REGISTRY_PASSWORD" "$WORDPDF_API_KEY"
|
||||||
|
cat <<'REMOTE'
|
||||||
|
set -euo pipefail
|
||||||
|
umask 077
|
||||||
|
cd "$DEPLOY_DIR"
|
||||||
|
rm -f restart.sh .env
|
||||||
# Состояние отката — image ID, на которых стек стоит сейчас (если поднят).
|
# Состояние отката — image ID, на которых стек стоит сейчас (если поднят).
|
||||||
if podman ps -a --format '{{.Names}}' | grep -qx wordpdf-prod-app-1 \
|
if podman ps -a --format '{{.Names}}' | grep -qx wordpdf-prod-app-1 \
|
||||||
&& podman ps -a --format '{{.Names}}' | grep -qx wordpdf-prod-web-1; then
|
&& podman ps -a --format '{{.Names}}' | grep -qx wordpdf-prod-web-1; then
|
||||||
@@ -282,6 +285,8 @@ jobs:
|
|||||||
done
|
done
|
||||||
curl -fsS "http://127.0.0.1:9010/actuator/health"
|
curl -fsS "http://127.0.0.1:9010/actuator/health"
|
||||||
podman-compose ps
|
podman-compose ps
|
||||||
|
REMOTE
|
||||||
|
} | ssh "$@" "$H" bash -s
|
||||||
|
|
||||||
autotests:
|
autotests:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@@ -318,20 +323,37 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [deploy, autotests]
|
needs: [deploy, autotests]
|
||||||
if: failure()
|
if: failure()
|
||||||
steps:
|
|
||||||
- name: Roll back prod to previous images
|
|
||||||
env:
|
env:
|
||||||
|
DEPLOY_HOST: ${{ vars.DEPLOY_HOST }}
|
||||||
|
DEPLOY_USER: ${{ vars.DEPLOY_USER }}
|
||||||
DEPLOY_DIR: ${{ vars.DEPLOY_DIR }}
|
DEPLOY_DIR: ${{ vars.DEPLOY_DIR }}
|
||||||
REGISTRY: ${{ vars.REGISTRY }}
|
REGISTRY: ${{ vars.REGISTRY }}
|
||||||
|
WORDPDF_MAX_MB: ${{ vars.WORDPDF_MAX_MB }}
|
||||||
|
WORDPDF_MAX_PAGES: ${{ vars.WORDPDF_MAX_PAGES }}
|
||||||
|
DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
|
||||||
WORDPDF_API_KEY: ${{ secrets.WORDPDF_API_KEY }}
|
WORDPDF_API_KEY: ${{ secrets.WORDPDF_API_KEY }}
|
||||||
uses: appleboy/ssh-action@v1.0.3
|
steps:
|
||||||
with:
|
# Конфиг рендерится заново (тот же шаг, что у deploy) и перезаливается: откат
|
||||||
host: ${{ vars.DEPLOY_HOST }}
|
# не зависит от того, что осталось на хосте после упавшего деплоя (рег. run 482:
|
||||||
username: ${{ vars.DEPLOY_USER }}
|
# rollback на битом compose тоже падал).
|
||||||
key: ${{ secrets.DEPLOY_SSH_KEY }}
|
- name: Render prod stack files
|
||||||
script_stop: true
|
run: *render-stack-files
|
||||||
envs: DEPLOY_DIR,REGISTRY,WORDPDF_API_KEY
|
|
||||||
script: |
|
- name: Upload compose and roll back
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
command -v ssh >/dev/null 2>&1 || { apt-get update -q && apt-get install -y -q openssh-client; }
|
||||||
|
mkdir -p "$HOME/.ssh" && chmod 700 "$HOME/.ssh"
|
||||||
|
printf '%s\n' "$DEPLOY_SSH_KEY" > "$HOME/.ssh/id_deploy"
|
||||||
|
chmod 600 "$HOME/.ssh/id_deploy"
|
||||||
|
set -- -i "$HOME/.ssh/id_deploy" -o StrictHostKeyChecking=accept-new
|
||||||
|
D=$(printf '%q' "$DEPLOY_DIR")
|
||||||
|
H="$DEPLOY_USER@$DEPLOY_HOST"
|
||||||
|
ssh "$@" "$H" "umask 077; mkdir -p $D && cat > $D/docker-compose.yml" < docker-compose.yml
|
||||||
|
{
|
||||||
|
printf 'export DEPLOY_DIR=%q REGISTRY=%q WORDPDF_API_KEY=%q\n' \
|
||||||
|
"$DEPLOY_DIR" "$REGISTRY" "$WORDPDF_API_KEY"
|
||||||
|
cat <<'REMOTE'
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
cd "$DEPLOY_DIR"
|
cd "$DEPLOY_DIR"
|
||||||
if [ ! -f .rollback.env ]; then
|
if [ ! -f .rollback.env ]; then
|
||||||
@@ -350,3 +372,5 @@ jobs:
|
|||||||
|| { echo "app НЕ healthy после отката" >&2; exit 1; }
|
|| { echo "app НЕ healthy после отката" >&2; exit 1; }
|
||||||
podman-compose up -d --force-recreate gateway
|
podman-compose up -d --force-recreate gateway
|
||||||
curl -fsS "http://127.0.0.1:9010/actuator/health"
|
curl -fsS "http://127.0.0.1:9010/actuator/health"
|
||||||
|
REMOTE
|
||||||
|
} | ssh "$@" "$H" bash -s
|
||||||
|
|||||||
Reference in New Issue
Block a user