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

fix docker minimum version

Browse Source
This commit is contained in:
peaklabs-dev
2024-11-12 13:27:26 +01:00
parent 0ce2fbff40
commit 408ba9cc7a
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Actions/Server/InstallDocker.php
View File

@@ -12,7 +12,7 @@ class InstallDocker
public function handle(Server $server) public function handle(Server $server)
{ {
$dockerVersion = config('constants.docker_install_version'); $dockerVersion = config('constants.docker.minimum_required_version');
$supported_os_type = $server->validateOS(); $supported_os_type = $server->validateOS();
if (! $supported_os_type) { if (! $supported_os_type) {
throw new \Exception('Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/installation#manually">documentation</a>.'); throw new \Exception('Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/installation#manually">documentation</a>.');

2
app/Livewire/Boarding/Index.php
View File

@@ -74,7 +74,7 @@ class Index extends Component
return redirect()->route('dashboard'); 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->privateKeyName = generate_random_name();
$this->remoteServerName = generate_random_name(); $this->remoteServerName = generate_random_name();
if (isDev()) { if (isDev()) {

2
app/Livewire/Server/ValidateAndInstall.php
View File

@@ -159,7 +159,7 @@ class ValidateAndInstall extends Component
$this->dispatch('refreshBoardingIndex'); $this->dispatch('refreshBoardingIndex');
$this->dispatch('success', 'Server validated.'); $this->dispatch('success', 'Server validated.');
} else { } 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: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.'; $this->error = 'Minimum Docker Engine version '.$requiredDockerVersion.' is not instaled. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
$this->server->update([ $this->server->update([
'validation_logs' => $this->error, 'validation_logs' => $this->error,

2
bootstrap/helpers/docker.php
View File

@@ -109,7 +109,7 @@ function format_docker_envs_to_json($rawOutput)
function checkMinimumDockerEngineVersion($dockerVersion) function checkMinimumDockerEngineVersion($dockerVersion)
{ {
$majorDockerVersion = str($dockerVersion)->before('.')->value(); $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) { if ($majorDockerVersion < $requiredDockerVersion) {
$dockerVersion = null; $dockerVersion = null;
} }

4
config/constants.php
View File

@@ -1,7 +1,6 @@
<?php <?php
return [ return [
'docker_install_version' => '26.0',
'docs' => [ 'docs' => [
'base_url' => 'https://coolify.io/docs', 'base_url' => 'https://coolify.io/docs',
'contact' => 'https://coolify.io/docs/contact', 'contact' => 'https://coolify.io/docs/contact',
@@ -13,6 +12,9 @@ return [
'server_interval' => 20, 'server_interval' => 20,
'command_timeout' => 7200, 'command_timeout' => 7200,
], ],
'docker' => [
'minimum_required_version' => '24.0',
],
'waitlist' => [ 'waitlist' => [
'expiration' => 10, 'expiration' => 10,
], ],