Merge pull request #1763 from coollabsio/next

v4.0.0-beta.220

app/Actions/Server/InstallLogDrain.php

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

app/Http/Controllers/Api/Deploy.php

@@ -18,8 +18,7 @@ class Deploy extends Controller
 {
     public function deploy(Request $request)
     {
-        $token = auth()->user()->currentAccessToken();
-        $teamId = data_get($token, 'team_id');
+        $teamId = get_team_id_from_token();
         $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/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/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/Models/Application.php

@@ -212,6 +212,9 @@ class Application extends BaseModel
 
         );
     }
+    public function isExited() {
+        return (bool) str($this->status)->startsWith('exited');
+    }
     public function realStatus()
     {
         return $this->getRawOriginal('status');

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 = [
-        'project_id'
-    ];
+    protected $guarded = [];
+
+    public function project()
+    {
+        return $this->belongsTo(Project::class);
+    }
 }

app/Models/Server.php

@@ -225,6 +225,29 @@ 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 +268,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()

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/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/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/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

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.219',
+    'release' => '4.0.0-beta.220',
     // 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.219';
+return '4.0.0-beta.220';

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/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/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

@@ -2,7 +2,7 @@
     <form wire:submit.prevent='submit' class="flex flex-col">
         <div class="flex gap-2">
             <h2>General</h2>
-            @if ($server->id !== 0)
+            @if ($server->id === 0)
                 <x-new-modal buttonTitle="Save" title="Change Localhost" action="submit">
                     You could lost a lot of functionalities if you change the server details of the server where Coolify
                     is

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>

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\Models\Tag;
-use App\Models\User;
-use App\Providers\RouteServiceProvider;
+use App\Http\Controllers\Api\Project;
+use App\Http\Controllers\Api\Server;
 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('/unsubscribe/{token}', function () {
-        try {
-            $token = request()->token;
-            $email = decrypt($token);
-            if (!User::whereEmail($email)->exists()) {
-                return redirect(RouteServiceProvider::HOME);
-            }
-            if (User::whereEmail($email)->first()->marketing_emails === false) {
-                return 'You have already unsubscribed from marketing emails.';
-            }
-            User::whereEmail($email)->update(['marketing_emails' => false]);
-            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');
-});
+Route::get('/{any}', function () {
+    return response()->json(['error' => 'Not found.'], 404);
+})->where('any', '.*');
+
+// Route::middleware(['throttle:5'])->group(function () {
+//     Route::get('/unsubscribe/{token}', function () {
+//         try {
+//             $token = request()->token;
+//             $email = decrypt($token);
+//             if (!User::whereEmail($email)->exists()) {
+//                 return redirect(RouteServiceProvider::HOME);
+//             }
+//             if (User::whereEmail($email)->first()->marketing_emails === false) {
+//                 return 'You have already unsubscribed from marketing emails.';
+//             }
+//             User::whereEmail($email)->update(['marketing_emails' => false]);
+//             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) ;;
-*)
-    echo "This script only supports Debian, Redhat or Sles based operating systems for now."
-    exit
-    ;;
+    arch | ubuntu | debian | raspbian | centos | fedora | rhel | ol | rocky | sles | opensuse-leap | opensuse-tumbleweed) ;;
+    *)
+        echo "This script only supports Debian, Redhat, Arch Linux, or SLES based operating systems for now."
+        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)
-    apt update -y >/dev/null 2>&1
-    apt 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
-    ;;
-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 or Sles based operating systems for now."
-    exit
-    ;;
+    arch)
+        pacman -Sy >/dev/null 2>&1 || true
+        if ! pacman -Q curl wget git jq >/dev/null 2>&1; then
+            pacman -S --noconfirm curl wget git jq >/dev/null 2>&1 || true
+        fi
+        ;;
+    ubuntu | debian | raspbian)
+        apt update -y >/dev/null 2>&1
+            apt 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
+        ;;
+    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 [ -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 [ "$OS_TYPE" = "arch" ]; then
+        pacman -Sy docker docker-compose --noconfirm
+        systemctl enable docker.service
         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
+            echo "Failed to install Docker with pacman. Try to install it manually."
+            echo "Please visit https://wiki.archlinux.org/title/docker for more information."
+            exit
+        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

versions.json

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