diff --git a/app/Actions/Server/InstallDocker.php b/app/Actions/Server/InstallDocker.php index ba6c23ffc..cbcb20368 100644 --- a/app/Actions/Server/InstallDocker.php +++ b/app/Actions/Server/InstallDocker.php @@ -12,7 +12,7 @@ class InstallDocker public function handle(Server $server) { - $dockerVersion = config('constants.docker_install_version'); + $dockerVersion = config('constants.docker.minimum_required_version'); $supported_os_type = $server->validateOS(); if (! $supported_os_type) { throw new \Exception('Server OS type is not supported for automated installation. Please install Docker manually before continuing: documentation.'); diff --git a/app/Livewire/Boarding/Index.php b/app/Livewire/Boarding/Index.php index 3d18ee5eb..b6c799c4e 100644 --- a/app/Livewire/Boarding/Index.php +++ b/app/Livewire/Boarding/Index.php @@ -74,7 +74,7 @@ class Index extends Component return redirect()->route('dashboard'); } - $this->minDockerVersion = str(config('constants.docker_install_version'))->before('.'); + $this->minDockerVersion = str(config('constants.docker.minimum_required_version'))->before('.'); $this->privateKeyName = generate_random_name(); $this->remoteServerName = generate_random_name(); if (isDev()) { diff --git a/app/Livewire/Server/ValidateAndInstall.php b/app/Livewire/Server/ValidateAndInstall.php index eed368973..791ef9350 100644 --- a/app/Livewire/Server/ValidateAndInstall.php +++ b/app/Livewire/Server/ValidateAndInstall.php @@ -159,7 +159,7 @@ class ValidateAndInstall extends Component $this->dispatch('refreshBoardingIndex'); $this->dispatch('success', 'Server validated.'); } else { - $requiredDockerVersion = str(config('constants.docker_install_version'))->before('.'); + $requiredDockerVersion = str(config('constants.docker.minimum_required_version'))->before('.'); $this->error = 'Minimum Docker Engine version '.$requiredDockerVersion.' is not instaled. Please install Docker manually before continuing: documentation.'; $this->server->update([ 'validation_logs' => $this->error, diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php index 299ee4051..b3d7f04cd 100644 --- a/bootstrap/helpers/docker.php +++ b/bootstrap/helpers/docker.php @@ -109,7 +109,7 @@ function format_docker_envs_to_json($rawOutput) function checkMinimumDockerEngineVersion($dockerVersion) { $majorDockerVersion = str($dockerVersion)->before('.')->value(); - $requiredDockerVersion = str(config('constants.docker_install_version'))->before('.')->value(); + $requiredDockerVersion = str(config('constants.docker.minimum_required_version'))->before('.')->value(); if ($majorDockerVersion < $requiredDockerVersion) { $dockerVersion = null; } diff --git a/config/constants.php b/config/constants.php index 1bec2e3bf..f42a64c71 100644 --- a/config/constants.php +++ b/config/constants.php @@ -1,7 +1,6 @@ '26.0', 'docs' => [ 'base_url' => 'https://coolify.io/docs', 'contact' => 'https://coolify.io/docs/contact', @@ -13,6 +12,9 @@ return [ 'server_interval' => 20, 'command_timeout' => 7200, ], + 'docker' => [ + 'minimum_required_version' => '24.0', + ], 'waitlist' => [ 'expiration' => 10, ],