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

wip

Browse Source
This commit is contained in:
Andras Bacsai
2023-06-20 20:19:31 +02:00
parent 9f0ca1cc2e
commit 3bdea4c931
15 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Actions/Proxy/CheckProxySettingsInSync.php
View File

@@ -20,7 +20,7 @@ class CheckProxySettingsInSync
$final_output = Str::of($output)->trim()->value;
}
$docker_compose_yml_base64 = base64_encode($final_output);
$server->extra_attributes->proxy_last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
$server->proxy->last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
$server->save();
if (is_null($output) || $reset) {
instant_remote_process([

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

@@ -12,9 +12,9 @@ class InstallProxy
{
public function __invoke(Server $server): Activity
{
if (is_null(data_get($server, 'extra_attributes.proxy_type'))) {
$server->extra_attributes->proxy_type = ProxyTypes::TRAEFIK_V2->value;
$server->extra_attributes->proxy_status = ProxyStatus::EXITED->value;
if (is_null(data_get($server, 'proxy.type'))) {
$server->proxy->type = ProxyTypes::TRAEFIK_V2->value;
$server->proxy->status = ProxyStatus::EXITED->value;
$server->save();
}
$proxy_path = config('coolify.proxy_config_path');
@@ -38,7 +38,7 @@ class InstallProxy
$configuration = Str::of($configuration)->trim()->value;
}
$docker_compose_yml_base64 = base64_encode($configuration);
$server->extra_attributes->proxy_last_applied_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
$server->proxy->last_applied_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
$server->save();
$activity = remote_process([
"echo 'Creating required Docker networks...'",

4
app/Data/ServerMetadata.php
View File

@@ -9,8 +9,8 @@ use Spatie\LaravelData\Data;
class ServerMetadata extends Data
{
public function __construct(
public ?ProxyTypes $proxy_type,
public ?ProxyStatus $proxy_status
public ?ProxyTypes $type,
public ?ProxyStatus $status
) {
}
}

14
app/Http/Livewire/Server/Proxy.php
View File

@@ -23,14 +23,14 @@ class Proxy extends Component
}
public function switchProxy()
{
$this->server->extra_attributes->proxy_type = null;
$this->server->proxy->type = null;
$this->server->save();
}
public function installProxy()
{
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->server->proxy->last_applied_settings &&
$this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings
) {
$this->saveConfiguration($this->server);
}
@@ -40,8 +40,8 @@ class Proxy extends Component
public function setProxy(string $proxy_type)
{
$this->server->extra_attributes->proxy_type = $proxy_type;
$this->server->extra_attributes->proxy_status = 'exited';
$this->server->proxy->type = $proxy_type;
$this->server->proxy->status = 'exited';
$this->server->save();
}
public function stopProxy()
@@ -49,7 +49,7 @@ class Proxy extends Component
instant_remote_process([
"docker rm -f coolify-proxy",
], $this->server);
$this->server->extra_attributes->proxy_status = 'exited';
$this->server->proxy->status = 'exited';
$this->server->save();
}
public function saveConfiguration(Server $server)
@@ -58,7 +58,7 @@ class Proxy extends Component
$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);
$server->extra_attributes->proxy_last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
$server->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",

6
app/Http/Livewire/Server/Proxy/Deploy.php
View File

@@ -19,8 +19,8 @@ class Deploy extends Component
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->server->proxy->last_applied_settings &&
$this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings
) {
$this->saveConfiguration($this->server);
}
@@ -32,7 +32,7 @@ class Deploy extends Component
instant_remote_process([
"docker rm -f coolify-proxy",
], $this->server);
$this->server->extra_attributes->proxy_status = 'exited';
$this->server->proxy->status = 'exited';
$this->server->save();
$this->emit('proxyStatusUpdated');
}

2
app/Jobs/InstanceProxyCheckJob.php
View File

@@ -29,7 +29,7 @@ class InstanceProxyCheckJob implements ShouldQueue
{
try {
$container_name = 'coolify-proxy';
$servers = Server::whereRelation('settings', 'is_reachable', true)->where('extra_attributes->proxy_type', ProxyTypes::TRAEFIK_V2)->get();
$servers = Server::whereRelation('settings', 'is_reachable', true)->where('proxy->type', ProxyTypes::TRAEFIK_V2)->get();
foreach ($servers as $server) {
$status = get_container_status(server: $server, container_id: $container_name);

12
app/Jobs/ProxyContainerStatusJob.php
View File

@@ -3,8 +3,6 @@
namespace App\Jobs;
use App\Enums\ProxyTypes;
use App\Models\Application;
use App\Models\ApplicationPreview;
use App\Models\Server;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeUnique;
@@ -12,8 +10,8 @@ use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Str;
use Illuminate\Queue\Middleware\WithoutOverlapping;
use Illuminate\Support\Str;
class ProxyContainerStatusJob implements ShouldQueue, ShouldBeUnique
{
@@ -39,13 +37,13 @@ class ProxyContainerStatusJob implements ShouldQueue, ShouldBeUnique
try {
$container = get_container_status(server: $this->server, all_data: true, container_id: 'coolify-proxy', throwError: true);
$status = $container['State']['Status'];
if ($this->server->extra_attributes->proxy_status !== $status) {
$this->server->extra_attributes->proxy_status = $status;
if ($this->server->extra_attributes->proxy_status === 'running') {
if ($this->server->proxy->status !== $status) {
$this->server->proxy->status = $status;
if ($this->server->proxy->status === 'running') {
$traefik = $container['Config']['Labels']['org.opencontainers.image.title'];
$version = $container['Config']['Labels']['org.opencontainers.image.version'];
if (isset($version) && isset($traefik) && $traefik === 'Traefik' && Str::of($version)->startsWith('v2')) {
$this->server->extra_attributes->proxy_type = ProxyTypes::TRAEFIK_V2->value;
$this->server->proxy->type = ProxyTypes::TRAEFIK_V2->value;
}
}
$this->server->save();

18
app/Models/Server.php
View File

@@ -4,9 +4,17 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Builder;
use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
use Spatie\SchemalessAttributes\SchemalessAttributesTrait;
class Server extends BaseModel
{
use SchemalessAttributesTrait;
protected $schemalessAttributes = [
'proxy',
];
public $casts = [
'proxy' => SchemalessAttributes::class,
];
protected static function booted()
{
static::created(function ($server) {
@@ -25,16 +33,14 @@ class Server extends BaseModel
'port',
'team_id',
'private_key_id',
'extra_attributes',
'proxy',
];
public $casts = [
'extra_attributes' => SchemalessAttributes::class,
];
public function scopeWithExtraAttributes(): Builder
public function scopeWithProxy(): Builder
{
return $this->extra_attributes->modelScope();
return $this->proxy->modelScope();
}
public function isEmpty()
{