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

update proxy things

Browse Source
This commit is contained in:
Andras Bacsai
2023-05-22 12:47:15 +02:00
parent f5bf07a7c3
commit c1bafccac1
7 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Actions/Proxy/InstallProxy.php
View File

@@ -11,7 +11,6 @@ use Spatie\Url\Url;
class InstallProxy
{
public function __invoke(Server $server): Activity
{
$proxy_path = config('coolify.proxy_config_path');

19
app/Http/Livewire/Project/Application/Danger.php
View File

@@ -2,8 +2,27 @@
namespace App\Http\Livewire\Project\Application;
use App\Models\Application;
use Livewire\Component;
class Danger extends Component
{
public Application $application;
public array $parameters;
public function mount()
{
$this->parameters = getParameters();
}
public function delete()
{
$destination = $this->application->destination->getMorphClass()::where('id', $this->application->destination->id)->first();
instantRemoteProcess(["docker rm -f {$this->application->uuid}"], $destination->server);
$this->application->delete();
return redirect()->route('project.resources', [
'project_uuid' => $this->parameters['project_uuid'],
'environment_name' => $this->parameters['environment_name']
]);
}
}

9
app/Http/Livewire/Project/Application/Deploy.php
View File

@@ -64,15 +64,6 @@ class Deploy extends Component
return $this->redirectToDeployment();
}
public function delete()
{
$this->stop();
Application::find($this->applicationId)->delete();
return redirect()->route('project.resources', [
'project_uuid' => $this->parameters['project_uuid'],
'environment_name' => $this->parameters['environment_name']
]);
}
public function stop()
{
instantRemoteProcess(["docker rm -f {$this->application->uuid}"], $this->destination->server);

8
app/Jobs/AutoUpdateJob.php
View File

@@ -6,7 +6,6 @@ use App\Enums\ActivityTypes;
use App\Models\InstanceSettings;
use App\Models\Server;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeUnique;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
@@ -15,7 +14,7 @@ use Illuminate\Support\Facades\Log;
class AutoUpdateJob implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, ShouldBeUnique;
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
/**
* Create a new job instance.
@@ -24,8 +23,6 @@ class AutoUpdateJob implements ShouldQueue
{
$instance_settings = InstanceSettings::get();
if (!$instance_settings->is_auto_update_enabled) {
Log::info('Auto update is disabled');
dd('Auto update is disabled');
$this->delete();
}
}
@@ -39,11 +36,9 @@ class AutoUpdateJob implements ShouldQueue
$latest_version = getLatestVersionOfCoolify();
$current_version = config('version');
if ($latest_version === $current_version) {
dd('no update, versions match', $latest_version, $current_version);
return;
}
if (version_compare($latest_version, $current_version, '<')) {
dd('no update, latest version is lower than current version');
return;
}
@@ -57,7 +52,6 @@ class AutoUpdateJob implements ShouldQueue
remoteProcess([
"sleep 10"
], $server, ActivityTypes::INLINE->value);
dd('update done');
} else {
$latest_version = getLatestVersionOfCoolify();
$current_version = config('version');