beenull/PhyrePanel-mirror
1
0
Fork 0
mirror of https://github.com/PhyreApps/PhyrePanel.git synced 2024-11-22 07:30:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

update

Browse source
This commit is contained in:
Bozhidar 2024-04-26 22:08:26 +03:00
parent 1f8cffd7f3
commit 9c27dd4fca
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
web/Modules/Docker/shell-scripts/install-docker.sh
View file

@ -1,5 +1,5 @@
sudo apt-get update sudo apt-get update -y
sudo apt-get install ca-certificates curl sudo apt-get install ca-certificates curl -y
sudo install -m 0755 -d /etc/apt/keyrings sudo install -m 0755 -d /etc/apt/keyrings
sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
sudo chmod a+r /etc/apt/keyrings/docker.asc sudo chmod a+r /etc/apt/keyrings/docker.asc
@ -11,4 +11,6 @@ echo \
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
sudo apt-get update sudo apt-get update
sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin -y
echo "Done!"

4
web/app/Filament/Pages/Modules.php
View file

@ -71,7 +71,7 @@ class Modules extends Page
$this->installLog = str_replace("\n", "<br>", $this->installLog); $this->installLog = str_replace("\n", "<br>", $this->installLog);
} }
if (Str::contains($this->installLog, 'Installed')) { if (Str::contains($this->installLog, 'Done')) {
$this->installLogPulling = false; $this->installLogPulling = false;
$newModule = new Module(); $newModule = new Module();
$newModule->name = $module; $newModule->name = $module;
@ -87,7 +87,7 @@ class Modules extends Page
$this->installLogPulling = true; $this->installLogPulling = true;
$this->installLogFilePath = storage_path('logs/' . $module . '-install.log'); $this->installLogFilePath = storage_path('logs/' . $module . '-install.log');
file_put_contents($this->installLogFilePath, 'Installing ' . $module . '...'); file_put_contents($this->installLogFilePath, 'Installing ' . $module . '...' . PHP_EOL);
$postInstall = app()->make('Modules\\' . $module . '\\PostInstall'); $postInstall = app()->make('Modules\\' . $module . '\\PostInstall');
if (method_exists($postInstall, 'run')) { if (method_exists($postInstall, 'run')) {