Merge dev into main

Merge dev into main for customer deploy.
ci: serialize customer deploys
2026-05-05 01:35:05 +03:00 · 2026-05-05 00:34:36 +02:00
1 changed files with 1 additions and 3 deletions
--- a/.gitea/workflows/deploy-customer-main.yml
+++ b/.gitea/workflows/deploy-customer-main.yml
@@ -166,9 +166,7 @@ jobs:
          )
          proxy_command="ssh -i ${key_path} -o BatchMode=yes -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o GlobalKnownHostsFile=/dev/null -o LogLevel=ERROR -o ConnectTimeout=15 -W %h:%p ${CUSTOMER_SSH_PROXY_HOST}"
          remote_command="set -euo pipefail
-             cd /ecos
-             FORCE_PULL=1 COMPOSE_FILE='${CUSTOMER_COMPOSE_FILE}' '${CUSTOMER_DEPLOY_SCRIPT}'
-             docker image prune -f"
+             flock -w 1800 /tmp/ecos-customer-deploy.lock /bin/sh -c 'cd /ecos && FORCE_PULL=1 COMPOSE_FILE=\"${CUSTOMER_COMPOSE_FILE}\" \"${CUSTOMER_DEPLOY_SCRIPT}\" && docker image prune -f'"

          ssh "${ssh_common[@]}" -o "ProxyCommand=${proxy_command}" "${CUSTOMER_DEPLOY_USER}@${CUSTOMER_DEPLOY_HOST}" "true"
          ssh "${ssh_common[@]}" -o "ProxyCommand=${proxy_command}" "${CUSTOMER_DEPLOY_USER}@${CUSTOMER_DEPLOY_HOST}" "${remote_command}"
Author	SHA1	Message	Date
avm	5d583edfaa	Merge dev into main All checks were successful CI/CD Pipeline / Quality Gate (push) Successful in 22s Details CI/CD Pipeline / Build and Push Images (push) Successful in 4s Details CI/CD Pipeline / Internal Notify (push) Successful in 1s Details CI/CD Pipeline / Deploy Dev in Dokploy (push) Successful in 1s Details Deploy Customer Main / Build, Push, Deploy (push) Successful in 17m31s Details Merge dev into main for customer deploy.	2026-05-05 01:35:05 +03:00
Aleksandr Meshchriakov	d082cb3885	ci: serialize customer deploys All checks were successful CI/CD Pipeline / Quality Gate (push) Successful in 18s Details CI/CD Pipeline / Quality Gate (pull_request) Successful in 18s Details CI/CD Pipeline / Build and Push Images (push) Successful in 4s Details CI/CD Pipeline / Build and Push Images (pull_request) Successful in 1s Details CI/CD Pipeline / Internal Notify (push) Successful in 1s Details CI/CD Pipeline / Deploy Dev in Dokploy (push) Successful in 1s Details CI/CD Pipeline / Internal Notify (pull_request) Successful in 0s Details CI/CD Pipeline / Deploy Dev in Dokploy (pull_request) Successful in 1s Details	2026-05-05 00:34:36 +02:00