save
This commit is contained in:
@@ -8,6 +8,7 @@ use Spatie\Activitylog\Models\Activity;
|
||||
|
||||
class ActivityMonitor extends Component
|
||||
{
|
||||
public bool $header = false;
|
||||
public $activityId;
|
||||
public $isPollingActive = false;
|
||||
|
||||
@@ -50,8 +51,4 @@ class ActivityMonitor extends Component
|
||||
]);
|
||||
$this->activity->save();
|
||||
}
|
||||
public function render()
|
||||
{
|
||||
return view('livewire.activity-monitor');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace App\Http\Livewire\Project\Application;
|
||||
|
||||
use App\Jobs\ContainerStatusJob;
|
||||
use App\Jobs\ApplicationContainerStatusJob;
|
||||
use App\Models\Application;
|
||||
use App\Models\ApplicationPreview;
|
||||
use Illuminate\Support\Collection;
|
||||
@@ -24,7 +24,7 @@ class Previews extends Component
|
||||
}
|
||||
public function loadStatus($pull_request_id)
|
||||
{
|
||||
dispatch(new ContainerStatusJob(
|
||||
dispatch(new ApplicationContainerStatusJob(
|
||||
application: $this->application,
|
||||
container_name: generate_container_name($this->application->uuid, $pull_request_id),
|
||||
pull_request_id: $pull_request_id
|
||||
|
||||
@@ -30,7 +30,6 @@ class Form extends Component
|
||||
public function installDocker()
|
||||
{
|
||||
$activity = resolve(InstallDocker::class)($this->server);
|
||||
|
||||
$this->emit('newMonitorActivity', $activity->id);
|
||||
}
|
||||
public function validateServer()
|
||||
|
||||
@@ -11,25 +11,21 @@ use Livewire\Component;
|
||||
|
||||
class Proxy extends Component
|
||||
{
|
||||
protected $listeners = ['serverValidated'];
|
||||
public Server $server;
|
||||
|
||||
public ProxyTypes $selectedProxy = ProxyTypes::TRAEFIK_V2;
|
||||
public $proxy_settings = null;
|
||||
|
||||
public function mount()
|
||||
{
|
||||
$this->proxyStatus();
|
||||
}
|
||||
protected $listeners = ['serverValidated', 'saveConfiguration'];
|
||||
public function serverValidated()
|
||||
{
|
||||
$this->server->settings->refresh();
|
||||
$this->server->refresh();
|
||||
}
|
||||
public function installProxy()
|
||||
{
|
||||
if (
|
||||
$this->server->extra_attributes->last_applied_proxy_settings &&
|
||||
$this->server->extra_attributes->last_saved_proxy_settings !== $this->server->extra_attributes->last_applied_proxy_settings
|
||||
$this->server->extra_attributes->proxy_last_applied_settings &&
|
||||
$this->server->extra_attributes->proxy_last_saved_settings !== $this->server->extra_attributes->proxy_last_applied_settings
|
||||
) {
|
||||
$this->saveConfiguration($this->server);
|
||||
}
|
||||
@@ -37,15 +33,9 @@ class Proxy extends Component
|
||||
$this->emit('newMonitorActivity', $activity->id);
|
||||
}
|
||||
|
||||
public function proxyStatus()
|
||||
public function setProxy(string $proxy_type)
|
||||
{
|
||||
$this->server->extra_attributes->proxy_status = get_container_status(server: $this->server, container_id: 'coolify-proxy');
|
||||
$this->server->save();
|
||||
$this->server->refresh();
|
||||
}
|
||||
public function setProxy()
|
||||
{
|
||||
$this->server->extra_attributes->proxy_type = $this->selectedProxy->value;
|
||||
$this->server->extra_attributes->proxy_type = $proxy_type;
|
||||
$this->server->extra_attributes->proxy_status = 'exited';
|
||||
$this->server->save();
|
||||
}
|
||||
@@ -57,17 +47,17 @@ class Proxy extends Component
|
||||
$this->server->extra_attributes->proxy_status = 'exited';
|
||||
$this->server->save();
|
||||
}
|
||||
public function saveConfiguration()
|
||||
public function saveConfiguration(Server $server)
|
||||
{
|
||||
try {
|
||||
$proxy_path = config('coolify.proxy_config_path');
|
||||
$this->proxy_settings = Str::of($this->proxy_settings)->trim()->value;
|
||||
$docker_compose_yml_base64 = base64_encode($this->proxy_settings);
|
||||
$this->server->extra_attributes->last_saved_proxy_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
|
||||
$this->server->save();
|
||||
$server->extra_attributes->proxy_last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
|
||||
$server->save();
|
||||
instant_remote_process([
|
||||
"echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml",
|
||||
], $this->server);
|
||||
], $server);
|
||||
} catch (\Exception $e) {
|
||||
return general_error_handler($e);
|
||||
}
|
||||
|
||||
43
app/Http/Livewire/Server/Proxy/Deploy.php
Normal file
43
app/Http/Livewire/Server/Proxy/Deploy.php
Normal file
@@ -0,0 +1,43 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Livewire\Server\Proxy;
|
||||
|
||||
use App\Actions\Proxy\InstallProxy;
|
||||
use App\Models\Server;
|
||||
use Livewire\Component;
|
||||
use Str;
|
||||
|
||||
class Deploy extends Component
|
||||
{
|
||||
public Server $server;
|
||||
public $proxy_settings = null;
|
||||
protected $listeners = ['proxyStatusUpdated', 'serverValidated' => 'proxyStatusUpdated'];
|
||||
public function proxyStatusUpdated()
|
||||
{
|
||||
$this->server->refresh();
|
||||
}
|
||||
public function deploy()
|
||||
{
|
||||
if (
|
||||
$this->server->extra_attributes->proxy_last_applied_settings &&
|
||||
$this->server->extra_attributes->proxy_last_saved_settings !== $this->server->extra_attributes->proxy_last_applied_settings
|
||||
) {
|
||||
$this->saveConfiguration($this->server);
|
||||
}
|
||||
$activity = resolve(InstallProxy::class)($this->server);
|
||||
$this->emit('newMonitorActivity', $activity->id);
|
||||
}
|
||||
public function stop()
|
||||
{
|
||||
instant_remote_process([
|
||||
"docker rm -f coolify-proxy",
|
||||
], $this->server);
|
||||
$this->server->extra_attributes->proxy_status = 'exited';
|
||||
$this->server->save();
|
||||
$this->emit('proxyStatusUpdated');
|
||||
}
|
||||
private function saveConfiguration(Server $server)
|
||||
{
|
||||
$this->emit('saveConfiguration', $server);
|
||||
}
|
||||
}
|
||||
29
app/Http/Livewire/Server/Proxy/Status.php
Normal file
29
app/Http/Livewire/Server/Proxy/Status.php
Normal file
@@ -0,0 +1,29 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Livewire\Server\Proxy;
|
||||
|
||||
use App\Jobs\ProxyContainerStatusJob;
|
||||
use App\Models\Server;
|
||||
use Livewire\Component;
|
||||
|
||||
class Status extends Component
|
||||
{
|
||||
public Server $server;
|
||||
protected $listeners = ['proxyStatusUpdated', 'serverValidated' => 'proxyStatusUpdated'];
|
||||
public function proxyStatusUpdated()
|
||||
{
|
||||
ray('Status: ' . $this->server->extra_attributes->proxy_status);
|
||||
$this->server->refresh();
|
||||
}
|
||||
public function proxyStatus()
|
||||
{
|
||||
try {
|
||||
dispatch(new ProxyContainerStatusJob(
|
||||
server: $this->server
|
||||
));
|
||||
$this->emit('proxyStatusUpdated');
|
||||
} catch (\Exception $e) {
|
||||
ray($e->getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user