rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes auto-committed by Conductor

Browse source
This commit is contained in:
Andras Bacsai 2025-10-22 13:03:17 +02:00
parent 466772f61a
commit 587517394b
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/Jobs/ApplicationDeploymentJob.php
View file

@ -1632,7 +1632,7 @@ private function health_check()
return; return;
} }
if ($this->application->custom_healthcheck_found) { if ($this->application->custom_healthcheck_found) {
$this->application_deployment_queue->addLogEntry('Custom healthcheck found, skipping default healthcheck.'); $this->application_deployment_queue->addLogEntry('Custom healthcheck found in Dockerfile.');
} }
if ($this->container_name) { if ($this->container_name) {
$counter = 1; $counter = 1;
@ -2358,16 +2358,22 @@ private function generate_compose_file()
]; ];
// Always use .env file // Always use .env file
$docker_compose['services'][$this->container_name]['env_file'] = ['.env']; $docker_compose['services'][$this->container_name]['env_file'] = ['.env'];
$docker_compose['services'][$this->container_name]['healthcheck'] = [
'test' => [ // Only add Coolify healthcheck if no custom HEALTHCHECK found in Dockerfile
'CMD-SHELL', // If custom_healthcheck_found is true, the Dockerfile's HEALTHCHECK will be used
$this->generate_healthcheck_commands(), // If healthcheck is disabled, no healthcheck will be added
], if (! $this->application->custom_healthcheck_found && ! $this->application->isHealthcheckDisabled()) {
'interval' => $this->application->health_check_interval.'s', $docker_compose['services'][$this->container_name]['healthcheck'] = [
'timeout' => $this->application->health_check_timeout.'s', 'test' => [
'retries' => $this->application->health_check_retries, 'CMD-SHELL',
'start_period' => $this->application->health_check_start_period.'s', $this->generate_healthcheck_commands(),
]; ],
'interval' => $this->application->health_check_interval.'s',
'timeout' => $this->application->health_check_timeout.'s',
'retries' => $this->application->health_check_retries,
'start_period' => $this->application->health_check_start_period.'s',
];
}
if (! is_null($this->application->limits_cpuset)) { if (! is_null($this->application->limits_cpuset)) {
data_set($docker_compose, 'services.'.$this->container_name.'.cpuset', $this->application->limits_cpuset); data_set($docker_compose, 'services.'.$this->container_name.'.cpuset', $this->application->limits_cpuset);