Merge pull request #1766 from coollabsio/next

v4.0.0-beta.221

README.md

@@ -10,6 +10,17 @@ No vendor lock-in, which means that all the configuration for your applications/
 
 For more information, take a look at our landing page [here](https://coolify.io).
 
+# Installation
+
+```bash
+curl -fsSL https://cdn.coollabs.io/coolify/install.sh | bash
+```
+You can find the installation script source [here](./scripts/install.sh).
+
+# Support
+
+Contact us [here](https://coolify.io/docs/contact).
+
 # Donations
 To stay completely free, open-source, no feature behind paywall and evolve the project, we need your help. If you like Coolify, please consider donating to help us fund the future development of the project.
 
@@ -66,16 +77,6 @@ By subscribing to the cloud version, you get the Coolify server for the same pri
 - Better support
 - Less maintenance for you
 
-# Installation
-
-```bash
-curl -fsSL https://cdn.coollabs.io/coolify/install.sh | bash
-```
-You can find the installation script source [here](./scripts/install.sh).
-
-# Support
-
-Contact us [here](https://coolify.io/docs/contact).
 
 # Recognitions
 

app/Actions/Database/StartMariadb.php

@@ -106,7 +106,6 @@ class StartMariadb
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $database_name = addslashes($database->name);
         $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }

app/Actions/Database/StartMongodb.php

@@ -122,7 +122,6 @@ class StartMongodb
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $database_name = addslashes($database->name);
         $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }

app/Actions/Database/StartMysql.php

@@ -106,7 +106,6 @@ class StartMysql
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $database_name = addslashes($database->name);
         $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server,callEventOnFinish: 'DatabaseStatusChanged');
     }

app/Actions/Database/StartPostgresql.php

@@ -128,7 +128,6 @@ class StartPostgresql
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $database_name = addslashes($database->name);
         $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }

app/Actions/Database/StartRedis.php

@@ -117,7 +117,6 @@ class StartRedis
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $database_name = addslashes($database->name);
         $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }

app/Actions/Server/InstallLogDrain.php

@@ -128,9 +128,9 @@ class InstallLogDrain
             if ($type !== 'custom') {
                 $parsers = base64_encode("
 [PARSER]
-Name        empty_line_skipper
+    Name        empty_line_skipper
-Format      regex
+    Format      regex
-Regex       /^(?!\s*$).+/
+    Regex       /^(?!\s*$).+/
 ");
             }
             $compose = base64_encode("

app/Actions/Service/StartService.php

@@ -13,10 +13,6 @@ class StartService
     {
         ray('Starting service: ' . $service->name);
         $service->saveComposeConfigs();
-
-        $service_name = addslashes($service->name);
-        $server_name = addslashes($service->server->name);
-
         $commands[] = "cd " . $service->workdir();
         $commands[] = "echo 'Saved configuration files to {$service->workdir()}.'";
         $commands[] = "echo 'Creating Docker network.'";

app/Http/Controllers/Api/Deploy.php

@@ -18,8 +18,7 @@ class Deploy extends Controller
 {
     public function deploy(Request $request)
     {
-        $token = auth()->user()->currentAccessToken();
+        $teamId = get_team_id_from_token();
-        $teamId = data_get($token, 'team_id');
         $uuids = $request->query->get('uuid');
         $tags = $request->query->get('tag');
         $force = $request->query->get('force') ?? false;

app/Http/Controllers/Api/Project.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Models\Project as ModelsProject;
+use Illuminate\Http\Request;
+
+class Project extends Controller
+{
+    public function projects(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $projects = ModelsProject::whereTeamId($teamId)->select('id', 'name', 'uuid')->get();
+        return response()->json($projects);
+    }
+    public function project_by_uuid(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $project = ModelsProject::whereTeamId($teamId)->whereUuid(request()->uuid)->first()->load(['environments']);
+        return response()->json($project);
+    }
+    public function environment_details(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $project = ModelsProject::whereTeamId($teamId)->whereUuid(request()->uuid)->first();
+        $environment = $project->environments()->whereName(request()->environment_name)->first()->load(['applications', 'postgresqls', 'redis', 'mongodbs', 'mysqls', 'mariadbs', 'services']);
+        return response()->json($environment);
+    }
+}

app/Http/Controllers/Api/Server.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Models\Server as ModelsServer;
+use Illuminate\Http\Request;
+
+class Server extends Controller
+{
+    public function servers(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $servers = ModelsServer::whereTeamId($teamId)->select('id', 'name', 'uuid', 'ip', 'user', 'port')->get()->load(['settings'])->map(function ($server) {
+            $server['is_reachable'] = $server->settings->is_reachable;
+            $server['is_usable'] = $server->settings->is_usable;
+            return $server;
+        });
+        ray($servers);
+        return response()->json($servers);
+    }
+    public function server_by_uuid(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $server = ModelsServer::whereTeamId($teamId)->whereUuid(request()->uuid)->first();
+        if (is_null($server)) {
+            return response()->json(['error' => 'Server not found.'], 404);
+        }
+        $server->load(['settings']);
+        $server['resources'] = $server->definedResources()->map(function ($resource) {
+            $payload = [
+                'id' => $resource->id,
+                'uuid' => $resource->uuid,
+                'name' => $resource->name,
+                'type' => $resource->type(),
+                'created_at' => $resource->created_at,
+                'updated_at' => $resource->updated_at,
+            ];
+            if ($resource->type() === 'service') {
+                $payload['status'] = $resource->status();
+            } else {
+                $payload['status'] = $resource->status;
+            }
+            return $payload;
+        });
+        return response()->json($server);
+    }
+}

app/Jobs/ApplicationDeploymentJob.php

@@ -1022,11 +1022,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->env_nixpacks_args = collect([]);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->nixpacks_environment_variables as $env) {
-                $this->env_nixpacks_args->push("--env {$env->key}={$env->real_value}");
+                if (!is_null($env->real_value)) {
+                    $this->env_nixpacks_args->push("--env {$env->key}={$env->real_value}");
+                }
             }
         } else {
             foreach ($this->application->nixpacks_environment_variables_preview as $env) {
-                $this->env_nixpacks_args->push("--env {$env->key}={$env->real_value}");
+                if (!is_null($env->real_value)) {
+                    $this->env_nixpacks_args->push("--env {$env->key}={$env->real_value}");
+                }
             }
         }
 
@@ -1037,11 +1041,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->env_args = collect([]);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->build_environment_variables as $env) {
-                $this->env_args->put($env->key, $env->real_value);
+                if (!is_null($env->real_value)) {
+                    $this->env_args->put($env->key, $env->real_value);
+                }
             }
         } else {
             foreach ($this->application->build_environment_variables_preview as $env) {
-                $this->env_args->put($env->key, $env->real_value);
+                if (!is_null($env->real_value)) {
+                    $this->env_args->put($env->key, $env->real_value);
+                }
             }
         }
         $this->env_args->put('SOURCE_COMMIT', $this->commit);

app/Livewire/Boarding/Index.php

@@ -206,7 +206,8 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         try {
             config()->set('coolify.mux_enabled', false);
 
-            instant_remote_process(['uptime'], $this->createdServer, true);
+            // EC2 does not have `uptime` command, lol
+            instant_remote_process(['ls /'], $this->createdServer, true);
 
             $this->createdServer->settings()->update([
                 'is_reachable' => true,

app/Livewire/Project/Resource/Index.php

@@ -104,7 +104,7 @@ class Index extends Component
                     'environment_name' => data_get($service, 'environment.name'),
                     'service_uuid' => data_get($service, 'uuid')
                 ]);
-                $service->status = serviceStatus($service);
+                $service->status = $service->status();
             }
             return $service;
         });

app/Livewire/Project/Service/ServiceApplicationView.php

@@ -17,6 +17,7 @@ class ServiceApplicationView extends Component
         'application.exclude_from_status' => 'required|boolean',
         'application.required_fqdn' => 'required|boolean',
         'application.is_log_drain_enabled' => 'nullable|boolean',
+        'application.is_gzip_enabled' => 'nullable|boolean',
     ];
     public function render()
     {

app/Livewire/Project/Service/StackForm.php

@@ -45,8 +45,10 @@ class StackForm extends Component
         $this->service->docker_compose_raw = $raw;
         $this->submit();
     }
-    public function instantSave() {
+    public function instantSave()
+    {
         $this->service->save();
+        $this->dispatch('success', 'Service  settings saved successfully.');
     }
 
     public function submit()

app/Livewire/Project/Shared/Destination.php

@@ -37,6 +37,9 @@ class Destination extends Component
         $this->networks = $this->networks->reject(function ($network) use ($all_networks) {
             return $all_networks->pluck('id')->contains($network->id);
         });
+        $this->networks = $this->networks->reject(function ($network) {
+            return $this->resource->destination->server->id == $network->server->id;
+        });
     }
     public function redeploy(int $network_id, int $server_id)
     {
@@ -70,7 +73,7 @@ class Destination extends Component
     }
     public function removeServer(int $network_id, int $server_id)
     {
-        if ($this->resource->destination->server->id == $server_id) {
+        if ($this->resource->destination->server->id == $server_id && $this->resource->destination->id == $network_id) {
             $this->dispatch('error', 'You cannot remove this destination server.', 'You are trying to remove the main server.');
             return;
         }

app/Livewire/Server/Form.php

@@ -13,8 +13,9 @@ class Form extends Component
     public ?string $wildcard_domain = null;
     public int $cleanup_after_percentage;
     public bool $dockerInstallationStarted = false;
+    public bool $revalidate = false;
 
-    protected $listeners = ['serverInstalled'];
+    protected $listeners = ['serverInstalled', 'revalidate' => '$refresh'];
 
     protected $rules = [
         'server.name' => 'required',
@@ -68,6 +69,10 @@ class Form extends Component
             return handleError($e, $this);
         }
     }
+    public function revalidate()
+    {
+        $this->revalidate = true;
+    }
     public function checkLocalhostConnection()
     {
         $uptime = $this->server->validateConnection();

app/Livewire/Server/Resources.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Livewire\Server;
+
+use App\Models\Server;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Support\Collection;
+use Livewire\Component;
+
+class Resources extends Component
+{
+    use AuthorizesRequests;
+    public ?Server $server = null;
+    public $parameters = [];
+    public Collection $unmanagedContainers;
+    public function getListeners()
+    {
+        $teamId = auth()->user()->currentTeam()->id;
+        return [
+            "echo-private:team.{$teamId},ApplicationStatusChanged" => 'refreshStatus',
+        ];
+    }
+
+    public function startUnmanaged($id) {
+        $this->server->startUnmanaged($id);
+        $this->dispatch('success', 'Container started.');
+        $this->loadUnmanagedContainers();
+    }
+    public function restartUnmanaged($id) {
+        $this->server->restartUnmanaged($id);
+        $this->dispatch('success', 'Container restarted.');
+        $this->loadUnmanagedContainers();
+    }
+    public function stopUnmanaged($id) {
+        $this->server->stopUnmanaged($id);
+        $this->dispatch('success', 'Container stopped.');
+        $this->loadUnmanagedContainers();
+    }
+    public function refreshStatus() {
+        $this->server->refresh();
+        $this->loadUnmanagedContainers();
+        $this->dispatch('success', 'Resource statuses refreshed.');
+    }
+    public function loadUnmanagedContainers() {
+        $this->unmanagedContainers = $this->server->loadUnmanagedContainers();
+    }
+    public function mount() {
+        $this->unmanagedContainers = collect();
+        $this->parameters = get_route_parameters();
+        try {
+            $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
+            if (is_null($this->server)) {
+                return redirect()->route('server.index');
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+        $this->loadUnmanagedContainers();
+    }
+    public function render()
+    {
+        return view('livewire.server.resources');
+    }
+}

app/Livewire/Server/ValidateAndInstall.php

@@ -19,12 +19,12 @@ class ValidateAndInstall extends Component
     public $docker_version = null;
     public $proxy_started = false;
     public $error = null;
+    public bool $ask = false;
 
     protected $listeners = ['validateServer' => 'init', 'validateDockerEngine', 'validateServerNow' => 'validateServer'];
 
     public function init(bool $install = true)
     {
-
         $this->install = $install;
         $this->uptime = null;
         $this->supported_os_type = null;
@@ -34,9 +34,14 @@ class ValidateAndInstall extends Component
         $this->proxy_started = null;
         $this->error = null;
         $this->number_of_tries = 0;
-        $this->dispatch('validateServerNow');
+        if (!$this->ask) {
+            $this->dispatch('validateServerNow');
+        }
+    }
+    public function startValidatingAfterAsking() {
+        $this->ask = false;
+        $this->init();
     }
-
     public function validateServer()
     {
         try {

app/Models/Application.php

@@ -6,6 +6,7 @@ use App\Enums\ApplicationDeploymentStatus;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Collection;
 use Spatie\Activitylog\Models\Activity;
 use Illuminate\Support\Str;
 use RuntimeException;
@@ -212,6 +213,10 @@ class Application extends BaseModel
 
         );
     }
+    public function isExited()
+    {
+        return (bool) str($this->status)->startsWith('exited');
+    }
     public function realStatus()
     {
         return $this->getRawOriginal('status');
@@ -518,17 +523,21 @@ class Application extends BaseModel
     {
         return "/artifacts/{$uuid}";
     }
-    function setGitImportSettings(string $deployment_uuid, string $git_clone_command)
+    function setGitImportSettings(string $deployment_uuid, string $git_clone_command, bool $public = false)
     {
         $baseDir = $this->generateBaseDir($deployment_uuid);
+
         if ($this->git_commit_sha !== 'HEAD') {
-            $git_clone_command = "{$git_clone_command} && cd {$baseDir} && git -c advice.detachedHead=false checkout {$this->git_commit_sha} >/dev/null 2>&1";
+            $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null\" git -c advice.detachedHead=false checkout {$this->git_commit_sha} >/dev/null 2>&1";
         }
         if ($this->settings->is_git_submodules_enabled) {
-            $git_clone_command = "{$git_clone_command} && cd {$baseDir} && git submodule update --init --recursive";
+            if ($public) {
+                $git_clone_command = "{$git_clone_command} && cd {$baseDir} && sed -i \"s#git@\(.*\):#https://\\1/#g\" {$baseDir}/.gitmodules || true";
+            }
+            $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null\" git submodule update --init --recursive";
         }
         if ($this->settings->is_git_lfs_enabled) {
-            $git_clone_command = "{$git_clone_command} && cd {$baseDir} && git lfs pull";
+            $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null\" git lfs pull";
         }
         return $git_clone_command;
     }
@@ -556,7 +565,7 @@ class Application extends BaseModel
                     $fullRepoUrl = "{$this->source->html_url}/{$customRepository}";
                     $git_clone_command = "{$git_clone_command} {$this->source->html_url}/{$customRepository} {$baseDir}";
                     if (!$only_checkout) {
-                        $git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command);
+                        $git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command, public: true);
                     }
                     if ($exec_in_docker) {
                         $commands->push(executeInDocker($deployment_uuid, $git_clone_command));
@@ -655,7 +664,7 @@ class Application extends BaseModel
         if ($this->deploymentType() === 'other') {
             $fullRepoUrl = $customRepository;
             $git_clone_command = "{$git_clone_command} {$customRepository} {$baseDir}";
-            $git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command);
+            $git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command, public: true);
 
             if ($pull_request_id !== 0) {
                 if ($git_type === 'gitlab') {

app/Models/Environment.php

@@ -26,7 +26,6 @@ class Environment extends Model
     {
         return $this->hasMany(Application::class);
     }
-
     public function postgresqls()
     {
         return $this->hasMany(StandalonePostgresql::class);

app/Models/ProjectSetting.php

@@ -6,7 +6,10 @@ use Illuminate\Database\Eloquent\Model;
 
 class ProjectSetting extends Model
 {
-    protected $fillable = [
+    protected $guarded = [];
-        'project_id'
+
-    ];
+    public function project()
+    {
+        return $this->belongsTo(Project::class);
+    }
 }

app/Models/Server.php

@@ -225,6 +225,32 @@ class Server extends BaseModel
         $services = $this->services();
         return $applications->concat($databases)->concat($services->get());
     }
+    public function stopUnmanaged($id)
+    {
+        return instant_remote_process(["docker stop -t 0 $id"], $this);
+    }
+    public function restartUnmanaged($id)
+    {
+        return instant_remote_process(["docker restart $id"], $this);
+    }
+    public function startUnmanaged($id)
+    {
+        return instant_remote_process(["docker start $id"], $this);
+    }
+    public function loadUnmanagedContainers()
+    {
+        $containers = instant_remote_process(["docker ps -a  --format '{{json .}}' "], $this);
+        $containers = format_docker_command_output_to_json($containers);
+        $containers = $containers->map(function ($container) {
+            $labels = data_get($container, 'Labels');
+            if (!str($labels)->contains("coolify.managed")) {
+                return $container;
+            }
+            return null;
+        });
+        $containers = $containers->filter();
+        return collect($containers);
+    }
     public function hasDefinedResources()
     {
         $applications = $this->applications()->count() > 0;
@@ -245,6 +271,8 @@ class Server extends BaseModel
             $mysqls = data_get($standaloneDocker, 'mysqls', collect([]));
             $mariadbs = data_get($standaloneDocker, 'mariadbs', collect([]));
             return $postgresqls->concat($redis)->concat($mongodbs)->concat($mysqls)->concat($mariadbs);
+        })->filter(function ($item) {
+            return data_get($item, 'name') !== 'coolify-db';
         })->flatten();
     }
     public function applications()
@@ -400,7 +428,9 @@ class Server extends BaseModel
         if ($server->skipServer()) {
             return false;
         }
-        $uptime = instant_remote_process(['uptime'], $server, false);
+        // EC2 does not have `uptime` command, lol
+
+        $uptime = instant_remote_process(['ls /'], $server, false);
         if (!$uptime) {
             $server->settings()->update([
                 'is_reachable' => false,

app/Models/Service.php

@@ -28,6 +28,48 @@ class Service extends BaseModel
     {
         return $this->morphToMany(Tag::class, 'taggable');
     }
+    public function status() {
+        $foundRunning = false;
+        $isDegraded = false;
+        $foundRestaring = false;
+        $applications = $this->applications;
+        $databases = $this->databases;
+        foreach ($applications as $application) {
+            if ($application->exclude_from_status) {
+                continue;
+            }
+            if (Str::of($application->status)->startsWith('running')) {
+                $foundRunning = true;
+            } else if (Str::of($application->status)->startsWith('restarting')) {
+                $foundRestaring = true;
+            } else {
+                $isDegraded = true;
+            }
+        }
+        foreach ($databases as $database) {
+            if ($database->exclude_from_status) {
+                continue;
+            }
+            if (Str::of($database->status)->startsWith('running')) {
+                $foundRunning = true;
+            } else if (Str::of($database->status)->startsWith('restarting')) {
+                $foundRestaring = true;
+            } else {
+                $isDegraded = true;
+            }
+        }
+        if ($foundRestaring) {
+            return 'degraded';
+        }
+        if ($foundRunning && !$isDegraded) {
+            return 'running';
+        } else if ($foundRunning && $isDegraded) {
+            return 'degraded';
+        } else if (!$foundRunning && !$isDegraded) {
+            return 'exited';
+        }
+        return 'exited';
+    }
     public function extraFields()
     {
         $fields = collect([]);

app/Models/ServiceApplication.php

@@ -23,6 +23,10 @@ class ServiceApplication extends BaseModel
     {
         return data_get($this, 'is_log_drain_enabled', false);
     }
+    public function isGzipEnabled()
+    {
+        return data_get($this, 'is_gzip_enabled', true);
+    }
     public function type()
     {
         return 'service';

app/Models/ServiceDatabase.php

@@ -21,6 +21,10 @@ class ServiceDatabase extends BaseModel
     {
         return data_get($this, 'is_log_drain_enabled', false);
     }
+    public function isGzipEnabled()
+    {
+        return true;
+    }
     public function type()
     {
         return 'service';

app/Models/StandaloneMariadb.php

@@ -82,6 +82,9 @@ class StandaloneMariadb extends BaseModel
     {
         return $this->morphToMany(Tag::class, 'taggable');
     }
+    public function project() {
+        return data_get($this, 'environment.project');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');

app/Models/StandaloneMongodb.php

@@ -85,6 +85,9 @@ class StandaloneMongodb extends BaseModel
     {
         return $this->morphToMany(Tag::class, 'taggable');
     }
+    public function project() {
+        return data_get($this, 'environment.project');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');

app/Models/StandaloneMysql.php

@@ -82,6 +82,9 @@ class StandaloneMysql extends BaseModel
     {
         return $this->morphToMany(Tag::class, 'taggable');
     }
+    public function project() {
+        return data_get($this, 'environment.project');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');

app/Models/StandalonePostgresql.php

@@ -82,6 +82,10 @@ class StandalonePostgresql extends BaseModel
     {
         return $this->morphToMany(Tag::class, 'taggable');
     }
+    public function project()
+    {
+        return data_get($this, 'environment.project');
+    }
     public function link()
     {
         if (data_get($this, 'environment.project.uuid')) {

app/Models/StandaloneRedis.php

@@ -77,6 +77,10 @@ class StandaloneRedis extends BaseModel
     {
         return $this->morphToMany(Tag::class, 'taggable');
     }
+    public function project()
+    {
+        return data_get($this, 'environment.project');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');

app/View/Components/Status/Services.php

@@ -15,8 +15,9 @@ class Services extends Component
     public function __construct(
         public Service $service,
         public string $complexStatus = 'exited',
+        public bool $showRefreshButton = true
     ) {
-        $this->complexStatus = serviceStatus($service);
+        $this->complexStatus = $service->status();
     }
 
     /**

bootstrap/helpers/api.php

@@ -0,0 +1,7 @@
+<?php
+
+function get_team_id_from_token()
+{
+    $token = auth()->user()->currentAccessToken();
+    return data_get($token, 'team_id');
+}

bootstrap/helpers/docker.php

@@ -7,7 +7,6 @@ use App\Models\ServiceApplication;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Spatie\Url\Url;
-use Visus\Cuid2\Cuid2;
 
 function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pullRequestId = null): Collection
 {
@@ -213,7 +212,7 @@ function generateServiceSpecificFqdns(ServiceApplication|Application $resource,
     }
     return $payload;
 }
-function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_https_enabled = false, $onlyPort = null, ?Collection $serviceLabels = null)
+function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_https_enabled = false, $onlyPort = null, ?Collection $serviceLabels = null, ?bool $is_gzip_enabled = true)
 {
     $labels = collect([]);
     $labels->push('traefik.enable=true');
@@ -276,23 +275,35 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                 }
                 if ($path !== '/') {
                     $labels->push("traefik.http.middlewares.{$https_label}-stripprefix.stripprefix.prefixes={$path}");
-                    $middlewares = "gzip,{$https_label}-stripprefix";
+                    $middlewares = collect(["{$https_label}-stripprefix"]);
-                    if ($basic_auth  && $basic_auth_middleware) {
+                    if ($is_gzip_enabled) {
-                        $middlewares = $middlewares . ',' . $basic_auth_middleware;
+                        $middlewares->push('gzip');
                     }
-                    if ($redirect && $redirect_middleware) {
-                        $middlewares = $middlewares . ',' . $redirect_middleware;
-                    }
-                    $labels->push("traefik.http.routers.{$https_label}.middlewares={$middlewares}");
-                } else {
-                    $middlewares = "gzip";
                     if ($basic_auth && $basic_auth_middleware) {
-                        $middlewares = $middlewares . ',' . $basic_auth_middleware;
+                        $middlewares->push($basic_auth_middleware);
                     }
                     if ($redirect && $redirect_middleware) {
-                        $middlewares = $middlewares . ',' . $redirect_middleware;
+                        $middlewares->push($redirect_middleware);
+                    }
+                    if ($middlewares->isNotEmpty()) {
+                        $middlewares = $middlewares->join(',');
+                        $labels->push("traefik.http.routers.{$https_label}.middlewares={$middlewares}");
+                    }
+                } else {
+                    $middlewares = collect([]);
+                    if ($is_gzip_enabled) {
+                        $middlewares->push('gzip');
+                    }
+                    if ($basic_auth && $basic_auth_middleware) {
+                        $middlewares->push($basic_auth_middleware);
+                    }
+                    if ($redirect && $redirect_middleware) {
+                        $middlewares->push($redirect_middleware);
+                    }
+                    if ($middlewares->isNotEmpty()) {
+                        $middlewares = $middlewares->join(',');
+                        $labels->push("traefik.http.routers.{$https_label}.middlewares={$middlewares}");
                     }
-                    $labels->push("traefik.http.routers.{$https_label}.middlewares={$middlewares}");
                 }
                 $labels->push("traefik.http.routers.{$https_label}.tls=true");
                 $labels->push("traefik.http.routers.{$https_label}.tls.certresolver=letsencrypt");
@@ -317,23 +328,35 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                 }
                 if ($path !== '/') {
                     $labels->push("traefik.http.middlewares.{$http_label}-stripprefix.stripprefix.prefixes={$path}");
-                    $middlewares = "gzip,{$http_label}-stripprefix";
+                    $middlewares = collect(["{$http_label}-stripprefix"]);
-                    if ($basic_auth  && $basic_auth_middleware) {
+                    if ($is_gzip_enabled) {
-                        $middlewares = $middlewares . ',' . $basic_auth_middleware;
+                        $middlewares->push('gzip');
                     }
-                    if ($redirect && $redirect_middleware) {
-                        $middlewares = $middlewares . ',' . $redirect_middleware;
-                    }
-                    $labels->push("traefik.http.routers.{$http_label}.middlewares={$middlewares}");
-                } else {
-                    $middlewares = "gzip";
                     if ($basic_auth && $basic_auth_middleware) {
-                        $middlewares = $middlewares . ',' . $basic_auth_middleware;
+                        $middlewares->push($basic_auth_middleware);
                     }
                     if ($redirect && $redirect_middleware) {
-                        $middlewares = $middlewares . ',' . $redirect_middleware;
+                        $middlewares->push($redirect_middleware);
+                    }
+                    if ($middlewares->isNotEmpty()) {
+                        $middlewares = $middlewares->join(',');
+                        $labels->push("traefik.http.routers.{$http_label}.middlewares={$middlewares}");
+                    }
+                } else {
+                    $middlewares = collect([]);
+                    if ($is_gzip_enabled) {
+                        $middlewares->push('gzip');
+                    }
+                    if ($basic_auth && $basic_auth_middleware) {
+                        $middlewares->push($basic_auth_middleware);
+                    }
+                    if ($redirect && $redirect_middleware) {
+                        $middlewares->push($redirect_middleware);
+                    }
+                    if ($middlewares->isNotEmpty()) {
+                        $middlewares = $middlewares->join(',');
+                        $labels->push("traefik.http.routers.{$http_label}.middlewares={$middlewares}");
                     }
-                    $labels->push("traefik.http.routers.{$http_label}.middlewares={$middlewares}");
                 }
             }
         } catch (\Throwable $e) {

bootstrap/helpers/proxy.php

@@ -103,6 +103,7 @@ function generate_default_proxy_configuration(Server $server)
         "traefik.http.routers.traefik.entrypoints=http",
         "traefik.http.routers.traefik.service=api@internal",
         "traefik.http.services.traefik.loadbalancer.server.port=8080",
+        "coolify.managed=true",
     ];
     $config = [
         "version" => "3.8",

bootstrap/helpers/remoteProcess.php

@@ -228,56 +228,6 @@ function refresh_server_connection(?PrivateKey $private_key = null)
     }
 }
 
-// function validateServer(Server $server, bool $throwError = false)
-// {
-//     try {
-//         $uptime = instant_remote_process(['uptime'], $server, $throwError);
-//         if (!$uptime) {
-//             $server->settings->is_reachable = false;
-//             $server->team->notify(new Unreachable($server));
-//             $server->unreachable_notification_sent = true;
-//             $server->save();
-//             return [
-//                 "uptime" => null,
-//                 "dockerVersion" => null,
-//             ];
-//         }
-//         $server->settings->is_reachable = true;
-//         instant_remote_process(["docker ps"], $server, $throwError);
-//         $dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $server, $throwError);
-//         if (!$dockerVersion) {
-//             $dockerVersion = null;
-//             return [
-//                 "uptime" => $uptime,
-//                 "dockerVersion" => null,
-//             ];
-//         }
-//         $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
-//         if (is_null($dockerVersion)) {
-//             $server->settings->is_usable = false;
-//         } else {
-//             $server->settings->is_usable = true;
-//             if (data_get($server, 'unreachable_notification_sent') === true) {
-//                 $server->team->notify(new Revived($server));
-//                 $server->unreachable_notification_sent = false;
-//                 $server->save();
-//             }
-//         }
-//         return [
-//             "uptime" => $uptime,
-//             "dockerVersion" => $dockerVersion,
-//         ];
-//     } catch (\Throwable $e) {
-//         $server->settings->is_reachable = false;
-//         $server->settings->is_usable = false;
-//         throw $e;
-//     } finally {
-//         if (data_get($server, 'settings')) {
-//             $server->settings->save();
-//         }
-//     }
-// }
-
 function checkRequiredCommands(Server $server)
 {
     $commands = collect(["jq", "jc"]);

bootstrap/helpers/services.php

@@ -21,49 +21,6 @@ function replaceVariables($variable)
     return $variable->replaceFirst('$', '')->replaceFirst('{', '')->replaceLast('}', '');
 }
 
-function serviceStatus(Service $service)
-{
-    $foundRunning = false;
-    $isDegraded = false;
-    $foundRestaring = false;
-    $applications = $service->applications;
-    $databases = $service->databases;
-    foreach ($applications as $application) {
-        if ($application->exclude_from_status) {
-            continue;
-        }
-        if (Str::of($application->status)->startsWith('running')) {
-            $foundRunning = true;
-        } else if (Str::of($application->status)->startsWith('restarting')) {
-            $foundRestaring = true;
-        } else {
-            $isDegraded = true;
-        }
-    }
-    foreach ($databases as $database) {
-        if ($database->exclude_from_status) {
-            continue;
-        }
-        if (Str::of($database->status)->startsWith('running')) {
-            $foundRunning = true;
-        } else if (Str::of($database->status)->startsWith('restarting')) {
-            $foundRestaring = true;
-        } else {
-            $isDegraded = true;
-        }
-    }
-    if ($foundRestaring) {
-        return 'degraded';
-    }
-    if ($foundRunning && !$isDegraded) {
-        return 'running';
-    } else if ($foundRunning && $isDegraded) {
-        return 'degraded';
-    } else if (!$foundRunning && !$isDegraded) {
-        return 'exited';
-    }
-    return 'exited';
-}
 function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase $oneService, bool $isInit = false)
 {
     // TODO: make this async

bootstrap/helpers/shared.php

@@ -1039,7 +1039,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                 $serviceLabels = $serviceLabels->merge($defaultLabels);
                 if (!$isDatabase && $fqdns->count() > 0) {
                     if ($fqdns) {
-                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($resource->uuid, $fqdns, true, serviceLabels: $serviceLabels));
+                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($resource->uuid, $fqdns, true, serviceLabels: $serviceLabels, is_gzip_enabled: $savedService->isGzipEnabled()));
                     }
                 }
                 if ($resource->server->isLogDrainEnabled() && $savedService->isLogDrainEnabled()) {

config/sentry.php

@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.217',
+    'release' => '4.0.0-beta.221',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.217';
+return '4.0.0-beta.221';

database/migrations/2024_02_15_192025_add_is_gzip_enabled_to_services.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('service_applications', function (Blueprint $table) {
+            $table->boolean('is_gzip_enabled')->default(true);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('service_applications', function (Blueprint $table) {
+            $table->dropColumn('is_gzip_enabled');
+        });
+    }
+};

resources/views/components/forms/input.blade.php

@@ -22,7 +22,7 @@
                     </svg>
                 </div>
             @endif
-            <input value="{{ $value }}" {{ $attributes->merge(['class' => $defaultClass . ' pl-10']) }}
+            <input value="{{ $value }}" {{ $attributes->merge(['class' => $defaultClass]) }}
                 @required($required) @if ($id !== 'null') wire:model={{ $id }} @endif
                 wire:dirty.class.remove='text-white' wire:dirty.class="input-warning" wire:loading.attr="disabled"
                 type="{{ $type }}" @readonly($readonly) @disabled($disabled) id="{{ $id }}"

resources/views/components/server/navbar.blade.php

@@ -18,6 +18,12 @@
             ]) }}">
             <button>General</button>
         </a>
+        <a class="{{ request()->routeIs('server.resources') ? 'text-white' : '' }}"
+            href="{{ route('server.resources', [
+                'server_uuid' => data_get($parameters, 'server_uuid'),
+            ]) }}">
+            <button>Resources</button>
+        </a>
         <a class="{{ request()->routeIs('server.private-key') ? 'text-white' : '' }}"
             href="{{ route('server.private-key', [
                 'server_uuid' => data_get($parameters, 'server_uuid'),

resources/views/components/services/navbar.blade.php

@@ -5,7 +5,7 @@
     </a>
     <x-services.links />
     <div class="flex-1"></div>
-    @if (serviceStatus($service) === 'degraded')
+    @if ($service->status() === 'degraded')
         <button wire:click='deploy' onclick="startService.showModal()"
             class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
             <svg class="w-5 h-5 text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@@ -26,7 +26,7 @@
             Stop
         </button>
     @endif
-    @if (serviceStatus($service) === 'running')
+    @if ($service->status() === 'running')
         <button wire:click='restart' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
             <svg class="w-5 h-5 text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                 <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
@@ -47,7 +47,7 @@
             Stop
         </button>
     @endif
-    @if (serviceStatus($service) === 'exited')
+    @if ($service->status() === 'exited')
         <button wire:click='stop(true)'
             class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
             <svg class="w-5 h-5 " viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">

resources/views/components/status/index.blade.php

@@ -1,11 +1,15 @@
+@props(['status', 'showRefreshButton' => true])
 @if (str($status)->startsWith('running'))
     <x-status.running :status="$status" />
-@elseif(str($status)->startsWith('restarting') || str($status)->startsWith('starting') || str($status)->startsWith('degraded'))
+@elseif(str($status)->startsWith('restarting') ||
+        str($status)->startsWith('starting') ||
+        str($status)->startsWith('degraded'))
     <x-status.restarting :status="$status" />
 @else
-    <x-status.stopped :status="$status" />
+    <x-status.stopped :status="$status"/>
 @endif
-@if (!str($status)->contains('exited'))
+
+@if (!str($status)->contains('exited') && $showRefreshButton)
     <button title="Refresh Status" wire:click='check_status(true)' class="mx-1 hover:fill-white fill-warning">
         <svg class="w-4 h-4" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
             <path

resources/views/components/status/services.blade.php

@@ -7,7 +7,7 @@
 @else
     <x-status.stopped :status="$complexStatus" />
 @endif
-@if (!str($complexStatus)->contains('exited'))
+@if (!str($complexStatus)->contains('exited') && $showRefreshButton)
     <button title="Refresh Status" wire:click='check_status(true)' class="mx-1 hover:fill-white fill-warning">
         <svg class="w-4 h-4" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
             <path

resources/views/livewire/boarding/index.blade.php

@@ -241,7 +241,7 @@
                 </x-slot:question>
                 <x-slot:actions>
                     <x-slide-over closeWithX fullScreen>
-                        <x-slot:title>Validating & Configuring</x-slot:title>
+                        <x-slot:title>Validate & configure</x-slot:title>
                         <x-slot:content>
                             <livewire:server.validate-and-install :server="$this->createdServer" />
                         </x-slot:content>

resources/views/livewire/project/application/general.blade.php

@@ -5,7 +5,7 @@
             <x-forms.button type="submit">
                 Save
             </x-forms.button>
-            @if ($isConfigurationChanged && !is_null($application->config_hash))
+            @if ($isConfigurationChanged && !is_null($application->config_hash) && !$application->isExited())
                 <div title="Configuration not applied to the running application. You need to redeploy.">
                     <svg class="w-6 h-6 text-warning" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
                         <path fill="currentColor" d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16"/>

resources/views/livewire/project/service/service-application-view.blade.php

@@ -32,7 +32,9 @@
             </div>
         </div>
         <h3 class="pt-2">Advanced</h3>
-        <div class="w-64">
+        <div class="w-96">
+            <x-forms.checkbox instantSave id="application.is_gzip_enabled" label="Enable gzip compression"
+            helper="You can disable gzip compression if you want. Some services are compressing data by default. In this case, you do not need this." />
             <x-forms.checkbox instantSave label="Exclude from service status"
                 helper="If you do not need to monitor this resource, enable. Useful if this service is optional."
                 id="application.exclude_from_status"></x-forms.checkbox>

resources/views/livewire/project/service/stack-form.blade.php

@@ -15,7 +15,8 @@
         <x-forms.input id="service.description" label="Description" />
     </div>
     <div class="w-96">
-        <x-forms.checkbox instantSave id="service.connect_to_docker_network" label="Connect To Predefined Network" helper="By default, you do not reach the Coolify defined networks.<br>Starting a docker compose based resource will have an internal network. <br>If you connect to a Coolify defined network, you maybe need to use different internal DNS names to connect to a resource.<br><br>For more information, check <a class='text-white underline' href='https://coolify.io/docs/docker/compose#connect-to-predefined-networks'>this</a>." />
+        <x-forms.checkbox instantSave id="service.connect_to_docker_network" label="Connect To Predefined Network"
+            helper="By default, you do not reach the Coolify defined networks.<br>Starting a docker compose based resource will have an internal network. <br>If you connect to a Coolify defined network, you maybe need to use different internal DNS names to connect to a resource.<br><br>For more information, check <a class='text-white underline' href='https://coolify.io/docs/docker/compose#connect-to-predefined-networks'>this</a>." />
     </div>
     @if ($fields)
         <div>

resources/views/livewire/server/delete.blade.php

@@ -15,44 +15,5 @@
                 This server will be deleted. It is not reversible. <br>Please think again.
             </x-new-modal>
         @endif
-        <div class="flex flex-col">
-            @forelse ($server->definedResources() as $resource)
-                @if ($loop->first)
-                    <h3 class="pt-4">Resources</h3>
-                @endif
-                @if ($resource->link())
-                    <a class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline" href="{{ $resource->link() }}">
-                        <div class="w-64">{{ str($resource->type())->headline() }}</div>
-                        <div>{{ $resource->name }}</div>
-                    </a>
-                @else
-                    <div class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline">
-                        <div class="w-64">{{ str($resource->type())->headline() }}</div>
-                        <div>{{ $resource->name }}</div>
-                    </div>
-                @endif
-            @empty
-            @endforelse
-        </div>
-    @else
-        <div class="flex flex-col">
-            @forelse ($server->definedResources() as $resource)
-                @if ($loop->first)
-                    <h3 class="pt-4">Resources</h3>
-                @endif
-                @if ($resource->link())
-                    <a class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline" href="{{ $resource->link() }}">
-                        <div class="w-64">{{ str($resource->type())->headline() }}</div>
-                        <div>{{ $resource->name }}</div>
-                    </a>
-                @else
-                    <div class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline">
-                        <div class="w-64">{{ str($resource->type())->headline() }}</div>
-                        <div>{{ $resource->name }}</div>
-                    </div>
-                @endif
-            @empty
-            @endforelse
-        </div>
     @endif
 </div>

resources/views/livewire/server/form.blade.php

@@ -10,16 +10,25 @@
                 </x-new-modal>
             @else
                 <x-forms.button type="submit">Save</x-forms.button>
+                <x-slide-over closeWithX fullScreen>
+                    <x-slot:title>Validate & configure</x-slot:title>
+                    <x-slot:content>
+                        <livewire:server.validate-and-install :server="$server" ask />
+                    </x-slot:content>
+                    <x-forms.button @click="slideOverOpen=true" wire:click.prevent='validateServer' isHighlighted>
+                        Revalidate server
+                    </x-forms.button>
+                </x-slide-over>
             @endif
         </div>
-        @if (!$server->isFunctional())
+        @if ($server->isFunctional())
-            You can't use this server until it is validated.
-        @else
             Server is reachable and validated.
+        @else
+            You can't use this server until it is validated.
         @endif
         @if ((!$server->settings->is_reachable || !$server->settings->is_usable) && $server->id !== 0)
             <x-slide-over closeWithX fullScreen>
-                <x-slot:title>Validating & Configuring</x-slot:title>
+                <x-slot:title>Validate & configure</x-slot:title>
                 <x-slot:content>
                     <livewire:server.validate-and-install :server="$server" />
                 </x-slot:content>

resources/views/livewire/server/resources.blade.php

@@ -0,0 +1,143 @@
+<div>
+    <x-server.navbar :server="$server" :parameters="$parameters" />
+
+    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'managed' }" class="flex h-full">
+        <div class="flex flex-col gap-4 xl:w-32">
+            <a :class="activeTab === 'managed' && 'text-white'"
+                @click.prevent="activeTab = 'managed'; window.location.hash = 'managed'" href="#">Managed</a>
+            <a :class="activeTab === 'unmanaged' && 'text-white'"
+                @click.prevent="activeTab = 'unmanaged'; window.location.hash = 'unmanaged'" href="#">Unmanaged</a>
+        </div>
+        <div class="w-full pl-8">
+            <div x-cloak x-show="activeTab === 'managed'" class="h-full">
+                <div class="flex flex-col">
+                    <div class="flex gap-2">
+                        <h2>Resources</h2>
+                        <x-forms.button wire:click="refreshStatus">Refresh</x-forms.button>
+                    </div>
+                    <div class="pb-4 title">Here you can find all resources that are managed by Coolify.</div>
+                </div>
+                <div class="flex flex-col">
+                    <div class="flex flex-col">
+                        <div class="overflow-x-auto">
+                            <div class="inline-block min-w-full">
+                                <div class="overflow-hidden">
+                                    <table class="min-w-full divide-y divide-coolgray-400">
+                                        <thead>
+                                            <tr class="text-neutral-500">
+                                                <th class="px-5 py-3 text-xs font-medium text-left uppercase">Project
+                                                </th>
+                                                <th class="px-5 py-3 text-xs font-medium text-left uppercase">
+                                                    Environment</th>
+                                                <th class="px-5 py-3 text-xs font-medium text-left uppercase">Name</th>
+                                                <th class="px-5 py-3 text-xs font-medium text-left uppercase">Type</th>
+                                                <th class="px-5 py-3 text-xs font-medium text-left uppercase">Status
+                                                </th>
+                                            </tr>
+                                        </thead>
+                                        <tbody class="divide-y divide-coolgray-400">
+                                            @forelse ($server->definedResources()->sortBy('name',SORT_NATURAL) as $resource)
+                                                <tr class="text-white bg-coolblack hover:bg-coolgray-100">
+                                                    <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                        {{ data_get($resource->project(), 'name') }}
+                                                    </td>
+                                                    <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                        {{ data_get($resource, 'environment.name') }}
+                                                    </td>
+                                                    <td class="px-5 py-4 text-sm whitespace-nowrap"><a class=""
+                                                            href="{{ $resource->link() }}">{{ $resource->name }} </a>
+                                                    </td>
+                                                    <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                        {{ str($resource->type())->headline() }}</td>
+                                                    <td class="px-5 py-4 text-sm font-medium whitespace-nowrap">
+                                                        @if ($resource->type() === 'service')
+                                                            <x-status.services :service="$resource" :showRefreshButton="false" />
+                                                        @else
+                                                            <x-status.index :status="$resource->status" :showRefreshButton="false" />
+                                                        @endif
+                                                    </td>
+                                                </tr>
+                                            @empty
+                                            @endforelse
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div x-cloak x-show="activeTab === 'unmanaged'" class="h-full">
+                <div class="flex flex-col">
+                    <div class="flex gap-2">
+                        <h2>Resources</h2>
+                        <x-forms.button wire:click="refreshStatus">Refresh</x-forms.button>
+                    </div>
+                    <div class="pb-4 title">Here you can find all other containers running on the server.</div>
+                </div>
+                @if ($unmanagedContainers->count() > 0)
+                    <div class="flex flex-col">
+                        <div class="flex flex-col">
+                            <div class="overflow-x-auto">
+                                <div class="inline-block min-w-full">
+                                    <div class="overflow-hidden">
+                                        <table class="min-w-full divide-y divide-coolgray-400">
+                                            <thead>
+                                                <tr class="text-neutral-500">
+                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">Name
+                                                    </th>
+                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">Image
+                                                    </th>
+                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">Status
+                                                    </th>
+                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">Action
+                                                    </th>
+                                                </tr>
+                                            </thead>
+                                            <tbody class="divide-y divide-coolgray-400">
+                                                @forelse ($unmanagedContainers->sortBy('name',SORT_NATURAL) as $resource)
+                                                    <tr class="text-white bg-coolblack hover:bg-coolgray-100">
+                                                        <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                            {{ data_get($resource, 'Names') }}
+                                                        </td>
+                                                        <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                            {{ data_get($resource, 'Image') }}
+                                                        </td>
+                                                        <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                            {{ data_get($resource, 'State') }}
+                                                        </td>
+                                                        <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                            @if (data_get($resource, 'State') === 'running')
+                                                                <x-forms.button
+                                                                    wire:click="restartUnmanaged('{{ data_get($resource, 'ID') }}')"
+                                                                    wire:key="{{ data_get($resource, 'ID') }}">Restart</x-forms.button>
+                                                                <x-forms.button isError
+                                                                    wire:click="stopUnmanaged('{{ data_get($resource, 'ID') }}')"
+                                                                    wire:key="{{ data_get($resource, 'ID') }}">Stop</x-forms.button>
+                                                            @elseif (data_get($resource, 'State') === 'exited')
+                                                                <x-forms.button
+                                                                    wire:click="startUnmanaged('{{ data_get($resource, 'ID') }}')"
+                                                                    wire:key="{{ data_get($resource, 'ID') }}">Start</x-forms.button>
+                                                            @elseif (data_get($resource, 'State') === 'restarting')
+                                                                <x-forms.button
+                                                                    wire:click="stopUnmanaged('{{ data_get($resource, 'ID') }}')"
+                                                                    wire:key="{{ data_get($resource, 'ID') }}">Stop</x-forms.button>
+                                                            @endif
+                                                        </td>
+                                                    </tr>
+                                                @empty
+                                                @endforelse
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                @endif
+            </div>
+        </div>
+    </div>
+
+
+</div>

resources/views/livewire/server/validate-and-install.blade.php

@@ -1,29 +1,12 @@
 <div class="flex flex-col gap-2">
-    @if ($uptime)
+    @if ($ask)
-        <div class="flex w-64 gap-2">Server is reachable: <svg class="w-5 h-5 text-success" viewBox="0 0 256 256"
+        This will revalidate the server, install / update Docker Engine, Docker Compose and all related
-                xmlns="http://www.w3.org/2000/svg">
+        configuration. It will also restart Docker Engine, so your running containers will be unreachable
-                <g fill="currentColor">
+        for the time being.
-                    <path
+        <x-forms.button isHighlighted wire:click='startValidatingAfterAsking    '>Continue</x-forms.button>
-                        d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
-                        opacity=".2" />
-                    <path
-                        d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
-                </g>
-            </svg></div>
     @else
-        @if ($error)
+        @if ($uptime)
-            <div class="flex w-64 gap-2">Server is reachable: <svg class="w-5 h-5 text-error" viewBox="0 0 256 256"
+            <div class="flex w-64 gap-2">Server is reachable: <svg class="w-5 h-5 text-success" viewBox="0 0 256 256"
-                    xmlns="http://www.w3.org/2000/svg">
-                    <path fill="currentColor"
-                        d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
-                </svg></div>
-        @else
-            <div class="w-64"><x-loading text="Server is reachable: " /></div>
-        @endif
-    @endif
-    @if ($uptime)
-        @if ($supported_os_type)
-            <div class="flex w-64 gap-2">Supported OS type: <svg class="w-5 h-5 text-success" viewBox="0 0 256 256"
                     xmlns="http://www.w3.org/2000/svg">
                     <g fill="currentColor">
                         <path
@@ -41,46 +24,12 @@
                             d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
                     </svg></div>
             @else
-                <div class="w-64"><x-loading text="Server is reachable:" /></div>
+                <div class="w-64"><x-loading text="Server is reachable: " /></div>
             @endif
         @endif
-    @endif
+        @if ($uptime)
-    @if ($uptime && $supported_os_type)
+            @if ($supported_os_type)
-        @if ($docker_installed)
+                <div class="flex w-64 gap-2">Supported OS type: <svg class="w-5 h-5 text-success" viewBox="0 0 256 256"
-            <div class="flex w-64 gap-2">Docker is installed: <svg class="w-5 h-5 text-success" viewBox="0 0 256 256"
-                    xmlns="http://www.w3.org/2000/svg">
-                    <g fill="currentColor">
-                        <path
-                            d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
-                            opacity=".2" />
-                        <path
-                            d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
-                    </g>
-                </svg></div>
-        @else
-            @if ($error)
-                <div class="flex w-64 gap-2">Docker is installed: <svg class="w-5 h-5 text-error" viewBox="0 0 256 256"
-                        xmlns="http://www.w3.org/2000/svg">
-                        <path fill="currentColor"
-                            d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
-                    </svg></div>
-            @else
-                <div class="w-64"><x-loading text="Docker is installed:" /></div>
-            @endif
-        @endif
-        @if ($docker_compose_installed)
-            <div class="flex w-64 gap-2">Docker Compose is installed: <svg class="w-5 h-5 text-success"
-                    viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-                    <g fill="currentColor">
-                        <path
-                            d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
-                            opacity=".2" />
-                        <path
-                            d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
-                    </g>
-                </svg></div>
-            @if ($proxy_started)
-                <div class="flex w-64 gap-2">Proxy Started: <svg class="w-5 h-5 text-success" viewBox="0 0 256 256"
                         xmlns="http://www.w3.org/2000/svg">
                         <g fill="currentColor">
                             <path
@@ -92,43 +41,101 @@
                     </svg></div>
             @else
                 @if ($error)
-                    <div class="flex w-64 gap-2">Proxy Started: <svg class="w-5 h-5 text-error" viewBox="0 0 256 256"
+                    <div class="flex w-64 gap-2">Server is reachable: <svg class="w-5 h-5 text-error"
-                            xmlns="http://www.w3.org/2000/svg">
+                            viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
                             <path fill="currentColor"
                                 d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
                         </svg></div>
                 @else
-                    <div class="w-64"><x-loading text="Proxy Started:" /></div>
+                    <div class="w-64"><x-loading text="Server is reachable:" /></div>
                 @endif
             @endif
-        @else
+        @endif
-            @if ($error)
+        @if ($uptime && $supported_os_type)
-                <div class="flex w-64 gap-2">Docker Compose is installed: <svg class="w-5 h-5 text-error"
+            @if ($docker_installed)
+                <div class="flex w-64 gap-2">Docker is installed: <svg class="w-5 h-5 text-success"
                         viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-                        <path fill="currentColor"
+                        <g fill="currentColor">
-                            d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
+                            <path
+                                d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
+                                opacity=".2" />
+                            <path
+                                d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
+                        </g>
                     </svg></div>
             @else
-                <div class="w-64"><x-loading text="Docker Compose is installed:" /></div>
+                @if ($error)
+                    <div class="flex w-64 gap-2">Docker is installed: <svg class="w-5 h-5 text-error"
+                            viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                            <path fill="currentColor"
+                                d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
+                        </svg></div>
+                @else
+                    <div class="w-64"><x-loading text="Docker is installed:" /></div>
+                @endif
             @endif
+            @if ($docker_compose_installed)
+                <div class="flex w-64 gap-2">Docker Compose is installed: <svg class="w-5 h-5 text-success"
+                        viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                        <g fill="currentColor">
+                            <path
+                                d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
+                                opacity=".2" />
+                            <path
+                                d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
+                        </g>
+                    </svg></div>
+                @if ($proxy_started)
+                    <div class="flex w-64 gap-2">Proxy Started: <svg class="w-5 h-5 text-success" viewBox="0 0 256 256"
+                            xmlns="http://www.w3.org/2000/svg">
+                            <g fill="currentColor">
+                                <path
+                                    d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
+                                    opacity=".2" />
+                                <path
+                                    d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
+                            </g>
+                        </svg></div>
+                @else
+                    @if ($error)
+                        <div class="flex w-64 gap-2">Proxy Started: <svg class="w-5 h-5 text-error"
+                                viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                                <path fill="currentColor"
+                                    d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
+                            </svg></div>
+                    @else
+                        <div class="w-64"><x-loading text="Proxy Started:" /></div>
+                    @endif
+                @endif
+            @else
+                @if ($error)
+                    <div class="flex w-64 gap-2">Docker Compose is installed: <svg class="w-5 h-5 text-error"
+                            viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                            <path fill="currentColor"
+                                d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
+                        </svg></div>
+                @else
+                    <div class="w-64"><x-loading text="Docker Compose is installed:" /></div>
+                @endif
+            @endif
+
         @endif
+        @isset($docker_version)
+            <div class="flex w-64 gap-2">Minimum Docker version installed: <svg class="w-5 h-5 text-success"
+                    viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                    <g fill="currentColor">
+                        <path
+                            d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
+                            opacity=".2" />
+                        <path
+                            d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
+                    </g>
+                </svg></div>
+        @endisset
 
+        <livewire:new-activity-monitor header="Logs" />
+        @isset($error)
+            <pre class="font-bold whitespace-pre-line text-error">{!! $error !!}</pre>
+        @endisset
     @endif
-    @isset($docker_version)
-        <div class="flex w-64 gap-2">Minimum Docker version installed: <svg class="w-5 h-5 text-success"
-                viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-                <g fill="currentColor">
-                    <path
-                        d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
-                        opacity=".2" />
-                    <path
-                        d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
-                </g>
-            </svg></div>
-    @endisset
-
-    <livewire:new-activity-monitor header="Logs" />
-    @isset($error)
-        <pre class="font-bold whitespace-pre-line text-error">{!! $error !!}</pre>
-    @endisset
 </div>

routes/api.php

@@ -1,36 +1,11 @@
 <?php
 
-use App\Actions\Database\StartMariadb;
-use App\Actions\Database\StartMongodb;
-use App\Actions\Database\StartMysql;
-use App\Actions\Database\StartPostgresql;
-use App\Actions\Database\StartRedis;
-use App\Actions\Service\StartService;
 use App\Http\Controllers\Api\Deploy;
-use App\Models\ApplicationDeploymentQueue;
+use App\Http\Controllers\Api\Project;
-use App\Models\Tag;
+use App\Http\Controllers\Api\Server;
-use App\Models\User;
-use App\Providers\RouteServiceProvider;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
-use Visus\Cuid2\Cuid2;
-
-/*
-|--------------------------------------------------------------------------
-| API Routes
-|--------------------------------------------------------------------------
-|
-| Here is where you can register API routes for your application. These
-| routes are loaded by the RouteServiceProvider and all of them will
-| be assigned to the "api" middleware group. Make something great!
-|
-*/
-
-$middlewares = ['auth:sanctum'];
-if (isDev()) {
-    $middlewares = [];
-}
 
 Route::get('/health', function () {
     return 'OK';
@@ -45,44 +20,41 @@ Route::post('/feedback', function (Request $request) {
     }
     return response()->json(['message' => 'Feedback sent.'], 200);
 });
-// Route::group([
+
-//     'middleware' => $middlewares,
-//     'prefix' => 'v1'
-// ], function () {
-//     Route::get('/deployments', function () {
-//         return ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->get([
-//             "id",
-//             "server_id",
-//             "status"
-//         ])->groupBy("server_id")->map(function ($item) {
-//             return $item;
-//         })->toArray();
-//     });
-// });
 Route::group([
     'middleware' => ['auth:sanctum'],
     'prefix' => 'v1'
 ], function () {
+    Route::get('/version', function () {
+        return response(config('version'));
+    });
     Route::get('/deploy', [Deploy::class, 'deploy']);
-
+    Route::get('/servers', [Server::class, 'servers']);
-
+    Route::get('/server/{uuid}', [Server::class, 'server_by_uuid']);
+    Route::get('/projects', [Project::class, 'projects']);
+    Route::get('/project/{uuid}', [Project::class, 'project_by_uuid']);
+    Route::get('/project/{uuid}/{environment_name}', [Project::class, 'environment_details']);
 });
 
-Route::middleware(['throttle:5'])->group(function () {
+Route::get('/{any}', function () {
-    Route::get('/unsubscribe/{token}', function () {
+    return response()->json(['error' => 'Not found.'], 404);
-        try {
+})->where('any', '.*');
-            $token = request()->token;
+
-            $email = decrypt($token);
+// Route::middleware(['throttle:5'])->group(function () {
-            if (!User::whereEmail($email)->exists()) {
+//     Route::get('/unsubscribe/{token}', function () {
-                return redirect(RouteServiceProvider::HOME);
+//         try {
-            }
+//             $token = request()->token;
-            if (User::whereEmail($email)->first()->marketing_emails === false) {
+//             $email = decrypt($token);
-                return 'You have already unsubscribed from marketing emails.';
+//             if (!User::whereEmail($email)->exists()) {
-            }
+//                 return redirect(RouteServiceProvider::HOME);
-            User::whereEmail($email)->update(['marketing_emails' => false]);
+//             }
-            return 'You have been unsubscribed from marketing emails.';
+//             if (User::whereEmail($email)->first()->marketing_emails === false) {
-        } catch (\Throwable $e) {
+//                 return 'You have already unsubscribed from marketing emails.';
-            return 'Something went wrong. Please try again or contact support.';
+//             }
-        }
+//             User::whereEmail($email)->update(['marketing_emails' => false]);
-    })->name('unsubscribe.marketing.emails');
+//             return 'You have been unsubscribed from marketing emails.';
-});
+//         } catch (\Throwable $e) {
+//             return 'Something went wrong. Please try again or contact support.';
+//         }
+//     })->name('unsubscribe.marketing.emails');
+// });

routes/web.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Http\Controllers\Api\Server as ApiServer;
 use App\Models\GitlabApp;
 use App\Models\PrivateKey;
 use App\Models\Server;
@@ -61,12 +62,13 @@ use App\Livewire\Security\PrivateKey\Show as SecurityPrivateKeyShow;
 use App\Livewire\Server\Index as ServerIndex;
 use App\Livewire\Server\Create as ServerCreate;
 use App\Livewire\Server\Show as ServerShow;
+use App\Livewire\Server\Resources as ResourcesShow;
+
 use App\Livewire\Server\Destination\Show as DestinationShow;
 use App\Livewire\Server\LogDrains;
 use App\Livewire\Server\PrivateKey\Show as PrivateKeyShow;
 use App\Livewire\Server\Proxy\Show as ProxyShow;
 use App\Livewire\Server\Proxy\Logs as ProxyLogs;
-
 use App\Livewire\Source\Github\Change as GitHubChange;
 use App\Livewire\Subscription\Index as SubscriptionIndex;
 
@@ -173,6 +175,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
 
     Route::prefix('server/{server_uuid}')->group(function () {
         Route::get('/', ServerShow::class)->name('server.show');
+        Route::get('/resources', ResourcesShow::class)->name('server.resources');
         Route::get('/proxy', ProxyShow::class)->name('server.proxy');
         Route::get('/proxy/logs', ProxyLogs::class)->name('server.proxy.logs');
         Route::get('/private-key', PrivateKeyShow::class)->name('server.private-key');

scripts/install.sh

@@ -11,7 +11,13 @@ DOCKER_VERSION="24.0"
 
 CDN="https://cdn.coollabs.io/coolify"
 OS_TYPE=$(grep -w "ID" /etc/os-release | cut -d "=" -f 2 | tr -d '"')
-OS_VERSION=$(grep -w "VERSION_ID" /etc/os-release | cut -d "=" -f 2 | tr -d '"')
+
+if [ "$OS_TYPE" = "arch" ]; then
+    OS_VERSION="rolling"
+else
+    OS_VERSION=$(grep -w "VERSION_ID" /etc/os-release | cut -d "=" -f 2 | tr -d '"')
+fi
+
 LATEST_VERSION=$(curl --silent $CDN/versions.json | grep -i version | sed -n '2p' | xargs | awk '{print $2}' | tr -d ',')
 DATE=$(date +"%Y%m%d-%H%M%S")
 
@@ -21,11 +27,11 @@ if [ $EUID != 0 ]; then
 fi
 
 case "$OS_TYPE" in
-ubuntu | debian | raspbian | centos | fedora | rhel | ol | rocky | sles | opensuse-leap | opensuse-tumbleweed) ;;
+    arch | ubuntu | debian | raspbian | centos | fedora | rhel | ol | rocky | sles | opensuse-leap | opensuse-tumbleweed) ;;
-*)
+    *)
-    echo "This script only supports Debian, Redhat or Sles based operating systems for now."
+        echo "This script only supports Debian, Redhat, Arch Linux, or SLES based operating systems for now."
-    exit
+        exit
-    ;;
+        ;;
 esac
 
 # Overwrite LATEST_VERSION if user pass a version number
@@ -48,33 +54,47 @@ echo -e "-------------"
 echo "Installing required packages..."
 
 case "$OS_TYPE" in
-ubuntu | debian | raspbian)
+    arch)
-    apt update -y >/dev/null 2>&1
+        pacman -Sy >/dev/null 2>&1 || true
-    apt install -y curl wget git jq >/dev/null 2>&1
+        if ! pacman -Q curl wget git jq >/dev/null 2>&1; then
-    ;;
+            pacman -S --noconfirm curl wget git jq >/dev/null 2>&1 || true
-centos | fedora | rhel | ol | rocky)
+        fi
-    dnf install -y curl wget git jq >/dev/null 2>&1
+        ;;
-    ;;
+    ubuntu | debian | raspbian)
-sles | opensuse-leap | opensuse-tumbleweed)
+        apt update -y >/dev/null 2>&1
-    zypper refresh >/dev/null 2>&1
+            apt install -y curl wget git jq >/dev/null 2>&1
-    zypper install -y curl wget git jq >/dev/null 2>&1
+        ;;
-    ;;
+    centos | fedora | rhel | ol | rocky)
-*)
+        dnf install -y curl wget git jq >/dev/null 2>&1
-    echo "This script only supports Debian, Redhat or Sles based operating systems for now."
+        ;;
-    exit
+    sles | opensuse-leap | opensuse-tumbleweed)
-    ;;
+        zypper refresh >/dev/null 2>&1
+        zypper install -y curl wget git jq >/dev/null 2>&1
+        ;;
+    *)
+        echo "This script only supports Debian, Redhat, Arch Linux, or SLES based operating systems for now."
+        exit
+        ;;
 esac
 
 # Detect OpenSSH server
 SSH_DETECTED=false
 if [ -x "$(command -v systemctl)" ]; then
     if systemctl status sshd >/dev/null 2>&1; then
-        echo "OpenSSH server is installed and running."
+        echo "OpenSSH server is installed."
+        SSH_DETECTED=true
+    fi
+    if systemctl status ssh >/dev/null 2>&1; then
+        echo "OpenSSH server is installed."
         SSH_DETECTED=true
     fi
 elif [ -x "$(command -v service)" ]; then
     if service sshd status >/dev/null 2>&1; then
-        echo "OpenSSH server is installed and running."
+        echo "OpenSSH server is installed."
+        SSH_DETECTED=true
+    fi
+    if service ssh status >/dev/null 2>&1; then
+        echo "OpenSSH server is installed."
         SSH_DETECTED=true
     fi
 fi
@@ -105,22 +125,35 @@ fi
 
 if ! [ -x "$(command -v docker)" ]; then
     echo "Docker is not installed. Installing Docker."
-    curl https://releases.rancher.com/install-docker/${DOCKER_VERSION}.sh | sh
+    if [ "$OS_TYPE" = "arch" ]; then
-    if [ -x "$(command -v docker)" ]; then
+        pacman -Sy docker docker-compose --noconfirm
-        echo "Docker installed successfully."
+        systemctl enable docker.service
-    else
-        echo "Docker installation failed with Rancher script. Trying with official script."
-        curl https://get.docker.com | sh -s -- --version ${DOCKER_VERSION}
         if [ -x "$(command -v docker)" ]; then
             echo "Docker installed successfully."
         else
-            echo "Docker installation failed with official script."
+            echo "Failed to install Docker with pacman. Try to install it manually."
-            echo "Maybe your OS is not supported."
+            echo "Please visit https://wiki.archlinux.org/title/docker for more information."
-            echo "Please visit https://docs.docker.com/engine/install/ and install Docker manually to continue."
+            exit
-            exit 1
+        fi
+    else
+        curl https://releases.rancher.com/install-docker/${DOCKER_VERSION}.sh | sh
+        if [ -x "$(command -v docker)" ]; then
+            echo "Docker installed successfully."
+        else
+            echo "Docker installation failed with Rancher script. Trying with official script."
+            curl https://get.docker.com | sh -s -- --version ${DOCKER_VERSION}
+            if [ -x "$(command -v docker)" ]; then
+                echo "Docker installed successfully."
+            else
+                echo "Docker installation failed with official script."
+                echo "Maybe your OS is not supported?"
+                echo "Please visit https://docs.docker.com/engine/install/ and install Docker manually to continue."
+                exit 1
+            fi
         fi
     fi
 fi
+
 echo -e "-------------"
 echo -e "Check Docker Configuration..."
 mkdir -p /etc/docker

templates/compose/docker-registry.yaml

@@ -0,0 +1,48 @@
+# documentation: https://docs.docker.com/registry/
+# slogan: The Docker Registry is a stateless, highly scalable server side application that stores and lets you distribute Docker images.
+# tags: registry,images,docker
+
+services:
+  registry:
+    image: registry:2
+    environment:
+      - SERVICE_FQDN_REGISTRY
+      - REGISTRY_AUTH=htpasswd
+      - REGISTRY_AUTH_HTPASSWD_REALM=Registry
+      - REGISTRY_AUTH_HTPASSWD_PATH=/auth/registry.password
+      - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/data
+    volumes:
+      - type: bind
+        source: ./auth/registry.password
+        target: /auth/registry.password
+        isDirectory: false
+        content: >-
+          testuser:$2y$05$/o2JvmI2bhExXIt6Oqxa7ekYB7v3scj1wFEf6tBslJvJOMoPQL.Gy
+      - type: bind
+        source: ./config/config.yml
+        target: /etc/docker/registry/config.yml
+        isDirectory: false
+        content: >-
+          version: 0.1
+
+          log:
+            fields:
+              service: registry
+          storage:
+            cache:
+              blobdescriptor: inmemory
+            filesystem:
+              rootdirectory: /var/lib/registry
+          http:
+            addr: :5000
+            headers:
+              X-Content-Type-Options: [nosniff]
+          health:
+            storagedriver:
+              enabled: true
+              interval: 10s
+              threshold: 3
+      - type: bind
+        source: ./data
+        target: /data
+        isDirectory: true

templates/service-templates.json

@@ -87,6 +87,16 @@
             "sql"
         ]
     },
+    "docker-registry": {
+        "documentation": "https:\/\/docs.docker.com\/registry\/",
+        "slogan": "The Docker Registry is a stateless, highly scalable server side application that stores and lets you distribute Docker images.",
+        "compose": "c2VydmljZXM6CiAgcmVnaXN0cnk6CiAgICBpbWFnZTogJ3JlZ2lzdHJ5OjInCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fUkVHSVNUUlkKICAgICAgLSBSRUdJU1RSWV9BVVRIPWh0cGFzc3dkCiAgICAgIC0gUkVHSVNUUllfQVVUSF9IVFBBU1NXRF9SRUFMTT1SZWdpc3RyeQogICAgICAtIFJFR0lTVFJZX0FVVEhfSFRQQVNTV0RfUEFUSD0vYXV0aC9yZWdpc3RyeS5wYXNzd29yZAogICAgICAtIFJFR0lTVFJZX1NUT1JBR0VfRklMRVNZU1RFTV9ST09URElSRUNUT1JZPS9kYXRhCiAgICB2b2x1bWVzOgogICAgICAtCiAgICAgICAgdHlwZTogYmluZAogICAgICAgIHNvdXJjZTogLi9hdXRoL3JlZ2lzdHJ5LnBhc3N3b3JkCiAgICAgICAgdGFyZ2V0OiAvYXV0aC9yZWdpc3RyeS5wYXNzd29yZAogICAgICAgIGlzRGlyZWN0b3J5OiBmYWxzZQogICAgICAgIGNvbnRlbnQ6ICd0ZXN0dXNlcjokMnkkMDUkL28ySnZtSTJiaEV4WEl0Nk9xeGE3ZWtZQjd2M3NjajF3RkVmNnRCc2xKdkpPTW9QUUwuR3knCiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2NvbmZpZy9jb25maWcueW1sCiAgICAgICAgdGFyZ2V0OiAvZXRjL2RvY2tlci9yZWdpc3RyeS9jb25maWcueW1sCiAgICAgICAgaXNEaXJlY3Rvcnk6IGZhbHNlCiAgICAgICAgY29udGVudDogInZlcnNpb246IDAuMVxubG9nOlxuICBmaWVsZHM6XG4gICAgc2VydmljZTogcmVnaXN0cnlcbnN0b3JhZ2U6XG4gIGNhY2hlOlxuICAgIGJsb2JkZXNjcmlwdG9yOiBpbm1lbW9yeVxuICBmaWxlc3lzdGVtOlxuICAgIHJvb3RkaXJlY3Rvcnk6IC92YXIvbGliL3JlZ2lzdHJ5XG5odHRwOlxuICBhZGRyOiA6NTAwMFxuICBoZWFkZXJzOlxuICAgIFgtQ29udGVudC1UeXBlLU9wdGlvbnM6IFtub3NuaWZmXVxuaGVhbHRoOlxuICBzdG9yYWdlZHJpdmVyOlxuICAgIGVuYWJsZWQ6IHRydWVcbiAgICBpbnRlcnZhbDogMTBzXG4gICAgdGhyZXNob2xkOiAzIgogICAgICAtCiAgICAgICAgdHlwZTogYmluZAogICAgICAgIHNvdXJjZTogLi9kYXRhCiAgICAgICAgdGFyZ2V0OiAvZGF0YQogICAgICAgIGlzRGlyZWN0b3J5OiB0cnVlCg==",
+        "tags": [
+            "registry",
+            "images",
+            "docker"
+        ]
+    },
     "dokuwiki": {
         "documentation": "https:\/\/www.dokuwiki.org\/faq",
         "slogan": "A lightweight and easy-to-use wiki platform for creating and managing documentation and knowledge bases with simplicity and flexibility.",

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.217"
+            "version": "4.0.0-beta.221"
         }
     }
 }