dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor: improve deployment status check in isAnyDeploymentInprogress function

Browse Source 
- Updated the isAnyDeploymentInprogress function to check for running jobs based on the current hostname.
- Enhanced the logic to return true if any job status is 'unknown' and to provide a clearer output regarding the number of deployments in progress.
- Modified the cloud_upgrade.sh script to loop until the deployment status check confirms no ongoing deployments before proceeding with the upgrade.
This commit is contained in:
Andras Bacsai
2025-01-10 18:34:16 +01:00
parent 02400added
commit db079c0c7d
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bootstrap/helpers/shared.php
View File

@@ -1258,14 +1258,23 @@ function get_public_ips()
function isAnyDeploymentInprogress() function isAnyDeploymentInprogress()
{ {
// Only use it in the deployment script
$count = ApplicationDeploymentQueue::whereIn('status', [ApplicationDeploymentStatus::IN_PROGRESS, ApplicationDeploymentStatus::QUEUED])->count(); $runningJobs = ApplicationDeploymentQueue::where('horizon_job_worker', gethostname())->where('status', ApplicationDeploymentStatus::IN_PROGRESS->value)->get();
if ($count > 0) { $horizonJobIds = [];
echo "There are $count deployments in progress. Exiting...\n"; foreach ($runningJobs as $runningJob) {
exit(1); $horizonJobId = getJobStatus($runningJob->horizon_job_id);
if ($horizonJobId === 'unknown') {
return true;
} }
$horizonJobIds[] = $runningJob->horizon_job_id;
}
if (count($horizonJobIds) === 0) {
echo "No deployments in progress.\n"; echo "No deployments in progress.\n";
exit(0); exit(0);
}
$horizonJobIds = collect($horizonJobIds)->unique()->toArray();
echo 'There are '.count($horizonJobIds)." deployments in progress.\n";
exit(1);
} }
function isBase64Encoded($strValue) function isBase64Encoded($strValue)

5
scripts/cloud_upgrade.sh
View File

@@ -3,7 +3,4 @@ export IMAGE=$1
docker system prune -af docker system prune -af
docker compose pull docker compose pull
read -p "Press Enter to update Coolify to $IMAGE..." </dev/tty read -p "Press Enter to update Coolify to $IMAGE..." </dev/tty
docker exec coolify sh -c "php artisan tinker --execute='isAnyDeploymentInprogress()'" while ! (docker exec coolify sh -c "php artisan tinker --execute='isAnyDeploymentInprogress()'" && docker compose up --remove-orphans --force-recreate -d --wait && echo $IMAGE > last_version); do sleep 1; done
docker compose up --remove-orphans --force-recreate -d --wait
echo $IMAGE > last_version
docker compose logs -f