Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: parse docker version better

Browse Source
This commit is contained in:
Andras Bacsai 2024-05-31 09:41:34 +02:00
parent 9bf87a3033
commit 86474d9f90
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Server.php
View File

@ -897,7 +897,9 @@ $schema://$host {
} }
public function validateDockerEngineVersion() public function validateDockerEngineVersion()
{ {
$dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $this, false); $dockerVersionRaw = instant_remote_process(["docker version --format json"], $this, false);
$dockerVersionJson = json_decode($dockerVersionRaw, true);
$dockerVersion = data_get($dockerVersionJson, 'Server.Version', '0.0.0');
$dockerVersion = checkMinimumDockerEngineVersion($dockerVersion); $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
if (is_null($dockerVersion)) { if (is_null($dockerVersion)) {
$this->settings->is_usable = false; $this->settings->is_usable = false;