Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: storage check for mounted disks #4647

Open
wants to merge 2 commits into
base: next
Choose a base branch
from
Open

fix: storage check for mounted disks #4647

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a79ae78
fix: storage check for mounted disks
kevmiota Dec 23, 2024
2dc546e
fix: use configured docker storage path for storageCheck
kevmiota Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Models/Server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ public function getMemoryMetrics(int $mins = 5)

public function getDiskUsage(): ?string
{
return instant_remote_process(['df / --output=pcent | tr -cd 0-9'], $this, false);
return instant_remote_process(['df "$(docker info --format \'{{.DockerRootDir}}\')" --output=pcent | tr -cd 0-9'], $this, false);
// return instant_remote_process(["df /| tail -1 | awk '{ print $5}' | sed 's/%//g'"], $this, false);
}

Expand Down Expand Up @@ -1271,7 +1271,7 @@ public function updateWithPrivateKey(array $data, ?PrivateKey $privateKey = null
public function storageCheck(): ?string
{
$commands = [
'df / --output=pcent | tr -cd 0-9',
'df "$(docker info --format \'{{.DockerRootDir}}\')" --output=pcent | tr -cd 0-9',
];

return instant_remote_process($commands, $this, false);
Expand Down