Merge pull request #2261 from coollabsio/next

v4.0.0-beta.285

README.md

@@ -34,6 +34,7 @@ Special thanks to our biggest sponsor, [CCCareers](https://cccareers.org/)!
 
 ## Github Sponsors ($40+)
 <a href="https://bc.direct"><img width="60px" alt="BC Direct" src="https://github.com/coollabsio/coolify/assets/5845193/a4063c41-95ed-4a32-8814-cd1475572e37"/></a>
+<a href="https://serpapi.com/?utm_source=coolify.io"><img width="60px" alt="SerpAPI" src="https://github.com/serpapi.png"/></a>
 <a href="https://typebot.io/?utm_source=coolify.io"><img src="https://pbs.twimg.com/profile_images/1509194008366657543/9I-C7uWT_400x400.jpg" width="60px" alt="typebot"/></a>
 <a href="https://www.quantcdn.io/?utm_source=coolify.io"><img src="https://github.com/quantcdn.png" width="60px" alt="QuantCDN"/></a> 
 <a href="https://www.runpod.io/?utm_source=coolify.io">

app/Actions/Docker/GetContainersStatus.php

@@ -6,14 +6,12 @@ use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Proxy\CheckProxy;
 use App\Actions\Proxy\StartProxy;
 use App\Actions\Shared\ComplexStatusCheck;
-use App\Models\Application;
 use App\Models\ApplicationPreview;
 use App\Models\Server;
 use App\Models\ServiceDatabase;
 use App\Notifications\Container\ContainerRestarted;
 use App\Notifications\Container\ContainerStopped;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Log;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class GetContainersStatus
@@ -24,9 +22,9 @@ class GetContainersStatus
 
     public function handle(Server $server)
     {
-        if (isDev()) {
-            $server = Server::find(0);
-        }
+        // if (isDev()) {
+        //     $server = Server::find(0);
+        // }
         $this->server = $server;
         if (!$this->server->isFunctional()) {
             return 'Server is not ready.';
@@ -154,7 +152,7 @@ class GetContainersStatus
                                 if ($isPublic) {
                                     $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
                                         if ($this->server->isSwarm()) {
-                                             // TODO: fix this with sentinel
+                                            // TODO: fix this with sentinel
                                             return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
                                         } else {
                                             return data_get($value, 'name') === "$uuid-proxy";
@@ -316,7 +314,7 @@ class GetContainersStatus
             $this->server->proxyType();
             $foundProxyContainer = $containers->filter(function ($value, $key) {
                 if ($this->server->isSwarm()) {
-                     // TODO: fix this with sentinel
+                    // TODO: fix this with sentinel
                     return data_get($value, 'Spec.Name') === 'coolify-proxy_traefik';
                 } else {
                     return data_get($value, 'name') === 'coolify-proxy';
@@ -442,19 +440,21 @@ class GetContainersStatus
                         if ($database_id) {
                             $service_db = ServiceDatabase::where('id', $database_id)->first();
                             if ($service_db) {
-                                $uuid = $service_db->service->uuid;
-                                $isPublic = data_get($service_db, 'is_public');
-                                if ($isPublic) {
-                                    $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
-                                        if ($this->server->isSwarm()) {
-                                            return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
-                                        } else {
-                                            return data_get($value, 'Name') === "/$uuid-proxy";
+                                $uuid = data_get($service_db, 'service.uuid');
+                                if ($uuid) {
+                                    $isPublic = data_get($service_db, 'is_public');
+                                    if ($isPublic) {
+                                        $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
+                                            if ($this->server->isSwarm()) {
+                                                return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
+                                            } else {
+                                                return data_get($value, 'Name') === "/$uuid-proxy";
+                                            }
+                                        })->first();
+                                        if (!$foundTcpProxy) {
+                                            StartDatabaseProxy::run($service_db);
+                                            // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$service_db->service->name}", $this->server));
                                         }
-                                    })->first();
-                                    if (!$foundTcpProxy) {
-                                        StartDatabaseProxy::run($service_db);
-                                        // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$service_db->service->name}", $this->server));
                                     }
                                 }
                             }

app/Jobs/ApplicationDeploymentJob.php

@@ -963,9 +963,23 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                             "save" => "health_check",
                             "append" => false
                         ],
-
+                        [
+                            "docker inspect --format='{{json .State.Health.Log}}' {$this->container_name}",
+                            "hidden" => true,
+                            "save" => "health_check_logs",
+                            "append" => false
+                        ],
                     );
                     $this->application_deployment_queue->addLogEntry("Attempt {$counter} of {$this->application->health_check_retries} | Healthcheck status: {$this->saved_outputs->get('health_check')}");
+                    $health_check_logs = data_get(collect(json_decode($this->saved_outputs->get('health_check_logs')))->last(), 'Output', '(no logs)');
+                    if (empty($health_check_logs)) {
+                        $health_check_logs = '(no logs)';
+                    }
+                    $health_check_return_code = data_get(collect(json_decode($this->saved_outputs->get('health_check_logs')))->last(), 'ExitCode', '(no return code)');
+                    if ($health_check_logs !== '(no logs)' || $health_check_return_code !== '(no return code)') {
+                        $this->application_deployment_queue->addLogEntry("Healthcheck logs: {$health_check_logs} | Return code: {$health_check_return_code}");
+                    }
+
                     if (Str::of($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'healthy') {
                         $this->newVersionIsHealthy = true;
                         $this->application->update(['status' => 'running']);
@@ -1618,12 +1632,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->application->health_check_path) {
             $this->full_healthcheck_url = "{$this->application->health_check_method}: {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}{$this->application->health_check_path}";
             $generated_healthchecks_commands = [
-                "curl -o /dev/null -w \"%{http_code}\" -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}{$this->application->health_check_path} | grep -q \"{$this->application->health_check_return_code}\" || wget --save-headers -O - {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}{$this->application->health_check_path} 2>/dev/null |grep HTTP/ |grep -q \"{$this->application->health_check_return_code}\" || exit 1"
+                "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}{$this->application->health_check_path} > /dev/null || wget -q -O- {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}{$this->application->health_check_path} > /dev/null || exit 1"
             ];
         } else {
             $this->full_healthcheck_url = "{$this->application->health_check_method}: {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}/";
             $generated_healthchecks_commands = [
-                "curl -o /dev/null -w \"%{http_code}\" -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}/ | grep -q \"{$this->application->health_check_return_code}\" || wget --save-headers -O - {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}/ 2>/dev/null |grep HTTP/ |grep -q \"{$this->application->health_check_return_code}\" || exit 1"
+                "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}/ > /dev/null || wget -q -O- {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}/ > /dev/null || exit 1"
             ];
         }
         return implode(' ', $generated_healthchecks_commands);

app/Jobs/ScheduledTaskJob.php

@@ -8,14 +8,13 @@ use App\Models\Server;
 use App\Models\Application;
 use App\Models\Service;
 use App\Models\Team;
+use App\Notifications\ScheduledTask\TaskFailed;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Collection;
-use Throwable;
 
 class ScheduledTaskJob implements ShouldQueue
 {
@@ -114,6 +113,7 @@ class ScheduledTaskJob implements ShouldQueue
                     'message' => $this->task_output ?? $e->getMessage(),
                 ]);
             }
+            $this->team?->notify(new TaskFailed($this->task, $e->getMessage()));
             // send_internal_notification('ScheduledTaskJob failed with: ' . $e->getMessage());
             throw $e;
         }

app/Jobs/SendMessageToDiscordJob.php

@@ -41,7 +41,6 @@ class SendMessageToDiscordJob implements ShouldQueue, ShouldBeEncrypted
         $payload = [
             'content' => $this->text,
         ];
-        ray($payload);
         Http::post($this->webhookUrl, $payload);
     }
 }

app/Livewire/Boarding/Index.php

@@ -52,6 +52,9 @@ class Index extends Component
 
     public function mount()
     {
+        if (auth()->user()?->isMember() && auth()->user()->currentTeam()->show_boarding === true) {
+            return redirect()->route('dashboard');
+        }
         $this->privateKeyName = generate_random_name();
         $this->remoteServerName = generate_random_name();
         if (isDev()) {

app/Livewire/Notifications/Discord.php

@@ -16,6 +16,7 @@ class Discord extends Component
         'team.discord_notifications_deployments' => 'nullable|boolean',
         'team.discord_notifications_status_changes' => 'nullable|boolean',
         'team.discord_notifications_database_backups' => 'nullable|boolean',
+        'team.discord_notifications_scheduled_tasks' => 'nullable|boolean',
     ];
     protected $validationAttributes = [
         'team.discord_webhook_url' => 'Discord Webhook',

app/Livewire/Notifications/Email.php

@@ -28,6 +28,7 @@ class Email extends Component
         'team.smtp_notifications_deployments' => 'nullable|boolean',
         'team.smtp_notifications_status_changes' => 'nullable|boolean',
         'team.smtp_notifications_database_backups' => 'nullable|boolean',
+        'team.smtp_notifications_scheduled_tasks' => 'nullable|boolean',
         'team.use_instance_email_settings' => 'boolean',
         'team.resend_enabled' => 'nullable|boolean',
         'team.resend_api_key' => 'nullable',

app/Livewire/Notifications/Telegram.php

@@ -18,10 +18,12 @@ class Telegram extends Component
         'team.telegram_notifications_deployments' => 'nullable|boolean',
         'team.telegram_notifications_status_changes' => 'nullable|boolean',
         'team.telegram_notifications_database_backups' => 'nullable|boolean',
+        'team.telegram_notifications_scheduled_tasks' => 'nullable|boolean',
         'team.telegram_notifications_test_message_thread_id' => 'nullable|string',
         'team.telegram_notifications_deployments_message_thread_id' => 'nullable|string',
         'team.telegram_notifications_status_changes_message_thread_id' => 'nullable|string',
         'team.telegram_notifications_database_backups_message_thread_id' => 'nullable|string',
+        'team.telegram_notifications_scheduled_tasks_thread_id' => 'nullable|string',
     ];
     protected $validationAttributes = [
         'team.telegram_token' => 'Token',

app/Livewire/Project/Application/General.php

@@ -31,7 +31,7 @@ class General extends Component
     public ?string $initialDockerComposeLocation = null;
     public ?string $initialDockerComposePrLocation = null;
 
-    public $parsedServices = [];
+    public null|Collection $parsedServices;
     public $parsedServiceDomains = [];
 
     protected $listeners = [
@@ -118,6 +118,10 @@ class General extends Component
     {
         try {
             $this->parsedServices = $this->application->parseCompose();
+            if (is_null($this->parsedServices) || empty($this->parsedServices)) {
+                $this->dispatch('error', "Failed to parse your docker-compose file. Please check the syntax and try again.");
+                return;
+            }
         } catch (\Throwable $e) {
             $this->dispatch('error', $e->getMessage());
         }
@@ -160,6 +164,10 @@ class General extends Component
                 return;
             }
             ['parsedServices' => $this->parsedServices, 'initialDockerComposeLocation' => $this->initialDockerComposeLocation, 'initialDockerComposePrLocation' => $this->initialDockerComposePrLocation] = $this->application->loadComposeFile($isInit);
+            if (is_null($this->parsedServices)) {
+                $this->dispatch('error', "Failed to parse your docker-compose file. Please check the syntax and try again.");
+                return;
+            }
             $compose = $this->application->parseCompose();
             $services = data_get($compose, 'services');
             if ($services) {

app/Livewire/Project/Resource/Create.php

@@ -12,7 +12,6 @@ class Create extends Component
     public $type;
     public function mount()
     {
-        $services = getServiceTemplates();
         $type = str(request()->query('type'));
         $destination_uuid = request()->query('destination');
         $server_id = request()->query('server_id');
@@ -25,83 +24,87 @@ class Create extends Component
         if (!$environment) {
             return redirect()->route('dashboard');
         }
-        if (in_array($type, DATABASE_TYPES)) {
-            if ($type->value() === "postgresql") {
-                $database = create_standalone_postgresql($environment->id, $destination_uuid);
-            } else if ($type->value() === 'redis') {
-                $database = create_standalone_redis($environment->id, $destination_uuid);
-            } else if ($type->value() === 'mongodb') {
-                $database = create_standalone_mongodb($environment->id, $destination_uuid);
-            } else if ($type->value() === 'mysql') {
-                $database = create_standalone_mysql($environment->id, $destination_uuid);
-            } else if ($type->value() === 'mariadb') {
-                $database = create_standalone_mariadb($environment->id, $destination_uuid);
-            } else if ($type->value() === 'keydb') {
-                $database = create_standalone_keydb($environment->id, $destination_uuid);
-            } else if ($type->value() === 'dragonfly') {
-                $database = create_standalone_dragonfly($environment->id, $destination_uuid);
-            } else if ($type->value() === 'clickhouse') {
-                $database = create_standalone_clickhouse($environment->id, $destination_uuid);
-            }
-            return redirect()->route('project.database.configuration', [
-                'project_uuid' => $project->uuid,
-                'environment_name' => $environment->name,
-                'database_uuid' => $database->uuid,
-            ]);
-        }
-        if ($type->startsWith('one-click-service-') && !is_null((int)$server_id)) {
-            $oneClickServiceName = $type->after('one-click-service-')->value();
-            $oneClickService = data_get($services, "$oneClickServiceName.compose");
-            $oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null);
-            if ($oneClickDotEnvs) {
-                $oneClickDotEnvs = str(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/')->filter(function ($value) {
-                    return !empty($value);
-                });
-            }
-            if ($oneClickService) {
-                $destination = StandaloneDocker::whereUuid($destination_uuid)->first();
-                $service_payload = [
-                    'name' => "$oneClickServiceName-" . str()->random(10),
-                    'docker_compose_raw' => base64_decode($oneClickService),
-                    'environment_id' => $environment->id,
-                    'service_type' => $oneClickServiceName,
-                    'server_id' => (int) $server_id,
-                    'destination_id' => $destination->id,
-                    'destination_type' => $destination->getMorphClass(),
-                ];
-                if ($oneClickServiceName === 'cloudflared') {
-                    data_set($service_payload, 'connect_to_docker_network', true);
+        if (isset($type) && isset($destination_uuid) && isset($server_id)) {
+            $services = getServiceTemplates();
+
+            if (in_array($type, DATABASE_TYPES)) {
+                if ($type->value() === "postgresql") {
+                    $database = create_standalone_postgresql($environment->id, $destination_uuid);
+                } else if ($type->value() === 'redis') {
+                    $database = create_standalone_redis($environment->id, $destination_uuid);
+                } else if ($type->value() === 'mongodb') {
+                    $database = create_standalone_mongodb($environment->id, $destination_uuid);
+                } else if ($type->value() === 'mysql') {
+                    $database = create_standalone_mysql($environment->id, $destination_uuid);
+                } else if ($type->value() === 'mariadb') {
+                    $database = create_standalone_mariadb($environment->id, $destination_uuid);
+                } else if ($type->value() === 'keydb') {
+                    $database = create_standalone_keydb($environment->id, $destination_uuid);
+                } else if ($type->value() === 'dragonfly') {
+                    $database = create_standalone_dragonfly($environment->id, $destination_uuid);
+                } else if ($type->value() === 'clickhouse') {
+                    $database = create_standalone_clickhouse($environment->id, $destination_uuid);
                 }
-                $service = Service::create($service_payload);
-                $service->name = "$oneClickServiceName-" . $service->uuid;
-                $service->save();
-                if ($oneClickDotEnvs?->count() > 0) {
-                    $oneClickDotEnvs->each(function ($value) use ($service) {
-                        $key = str()->before($value, '=');
-                        $value = str(str()->after($value, '='));
-                        $generatedValue = $value;
-                        if ($value->contains('SERVICE_')) {
-                            $command = $value->after('SERVICE_')->beforeLast('_');
-                            $generatedValue = generateEnvValue($command->value(), $service);
-                        }
-                        EnvironmentVariable::create([
-                            'key' => $key,
-                            'value' => $generatedValue,
-                            'service_id' => $service->id,
-                            'is_build_time' => false,
-                            'is_preview' => false,
-                        ]);
-                    });
-                }
-                $service->parse(isNew: true);
-                return redirect()->route('project.service.configuration', [
-                    'service_uuid' => $service->uuid,
-                    'environment_name' => $environment->name,
+                return redirect()->route('project.database.configuration', [
                     'project_uuid' => $project->uuid,
+                    'environment_name' => $environment->name,
+                    'database_uuid' => $database->uuid,
                 ]);
             }
+            if ($type->startsWith('one-click-service-') && !is_null((int)$server_id)) {
+                $oneClickServiceName = $type->after('one-click-service-')->value();
+                $oneClickService = data_get($services, "$oneClickServiceName.compose");
+                $oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null);
+                if ($oneClickDotEnvs) {
+                    $oneClickDotEnvs = str(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/')->filter(function ($value) {
+                        return !empty($value);
+                    });
+                }
+                if ($oneClickService) {
+                    $destination = StandaloneDocker::whereUuid($destination_uuid)->first();
+                    $service_payload = [
+                        'name' => "$oneClickServiceName-" . str()->random(10),
+                        'docker_compose_raw' => base64_decode($oneClickService),
+                        'environment_id' => $environment->id,
+                        'service_type' => $oneClickServiceName,
+                        'server_id' => (int) $server_id,
+                        'destination_id' => $destination->id,
+                        'destination_type' => $destination->getMorphClass(),
+                    ];
+                    if ($oneClickServiceName === 'cloudflared') {
+                        data_set($service_payload, 'connect_to_docker_network', true);
+                    }
+                    $service = Service::create($service_payload);
+                    $service->name = "$oneClickServiceName-" . $service->uuid;
+                    $service->save();
+                    if ($oneClickDotEnvs?->count() > 0) {
+                        $oneClickDotEnvs->each(function ($value) use ($service) {
+                            $key = str()->before($value, '=');
+                            $value = str(str()->after($value, '='));
+                            $generatedValue = $value;
+                            if ($value->contains('SERVICE_')) {
+                                $command = $value->after('SERVICE_')->beforeLast('_');
+                                $generatedValue = generateEnvValue($command->value(), $service);
+                            }
+                            EnvironmentVariable::create([
+                                'key' => $key,
+                                'value' => $generatedValue,
+                                'service_id' => $service->id,
+                                'is_build_time' => false,
+                                'is_preview' => false,
+                            ]);
+                        });
+                    }
+                    $service->parse(isNew: true);
+                    return redirect()->route('project.service.configuration', [
+                        'service_uuid' => $service->uuid,
+                        'environment_name' => $environment->name,
+                        'project_uuid' => $project->uuid,
+                    ]);
+                }
+            }
+            $this->type = $type->value();
         }
-        $this->type = $type->value();
     }
     public function render()
     {

app/Livewire/Team/AdminView.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Livewire\Team;
+
+use App\Models\Team;
+use App\Models\User;
+use Livewire\Component;
+
+class AdminView extends Component
+{
+    public $users;
+    public ?string $search = "";
+    public function mount()
+    {
+        if (!isInstanceAdmin()) {
+            return redirect()->route('dashboard');
+        }
+        $this->getUsers();
+    }
+    public function submitSearch()
+    {
+        if ($this->search !== "") {
+            $this->users = User::where(function ($query) {
+                $query->where('name', 'like', "%{$this->search}%")
+                    ->orWhere('email', 'like', "%{$this->search}%");
+            })->get()->filter(function ($user) {
+                return $user->id !== auth()->id();
+            });
+        } else {
+            $this->getUsers();
+        }
+    }
+    public function getUsers()
+    {
+        $this->users = User::where('id', '!=', auth()->id())->get();
+        // $this->users = User::all();
+    }
+    private function finalizeDeletion(User $user, Team $team)
+    {
+        $servers = $team->servers;
+        foreach ($servers as $server) {
+            $resources = $server->definedResources();
+            foreach ($resources as $resource) {
+                ray("Deleting resource: " . $resource->name);
+                $resource->forceDelete();
+            }
+            ray("Deleting server: " . $server->name);
+            $server->forceDelete();
+        }
+
+        $projects = $team->projects;
+        foreach ($projects as $project) {
+            ray("Deleting project: " . $project->name);
+            $project->forceDelete();
+        }
+        $team->members()->detach($user->id);
+        ray('Deleting team: ' . $team->name);
+        $team->delete();
+    }
+    public function delete($id)
+    {
+        $user = User::find($id);
+        $teams = $user->teams;
+        foreach ($teams as $team) {
+            ray($team->name);
+            $user_alone_in_team = $team->members->count() === 1;
+            if ($team->id === 0) {
+                if ($user_alone_in_team) {
+                    ray('user is alone in the root team, do nothing');
+                    return $this->dispatch('error', 'User is alone in the root team, cannot delete');
+                }
+            }
+            if ($user_alone_in_team) {
+                ray('user is alone in the team');
+                $this->finalizeDeletion($user, $team);
+                continue;
+            }
+            ray('user is not alone in the team');
+            if ($user->isOwner()) {
+                $found_other_owner_or_admin = $team->members->filter(function ($member) {
+                    return $member->pivot->role === 'owner' || $member->pivot->role === 'admin';
+                })->where('id', '!=', $user->id)->first();
+
+                if ($found_other_owner_or_admin) {
+                    ray('found other owner or admin');
+                    $team->members()->detach($user->id);
+                    continue;
+                } else {
+                    $found_other_member_who_is_not_owner = $team->members->filter(function ($member) {
+                        return $member->pivot->role === 'member';
+                    })->first();
+                    if ($found_other_member_who_is_not_owner) {
+                        ray('found other member who is not owner');
+                        $found_other_member_who_is_not_owner->pivot->role = 'owner';
+                        $found_other_member_who_is_not_owner->pivot->save();
+                        $team->members()->detach($user->id);
+                    } else {
+                        // This should never happen as if the user is the only member in the team, the team should be deleted already.
+                        ray('found no other member who is not owner');
+                        $this->finalizeDeletion($user, $team);
+                    }
+                    continue;
+                }
+            } else {
+                ray('user is not owner');
+                $team->members()->detach($user->id);
+            }
+        }
+        ray("Deleting user: " . $user->name);
+        $user->delete();
+        $this->getUsers();
+    }
+    public function render()
+    {
+        return view('livewire.team.admin-view');
+    }
+}

app/Models/Application.php

@@ -113,6 +113,18 @@ class Application extends BaseModel
         }
         return null;
     }
+    public function failedTaskLink($task_uuid)
+    {
+        if (data_get($this, 'environment.project.uuid')) {
+            return route('project.application.scheduled-tasks', [
+                'project_uuid' => data_get($this, 'environment.project.uuid'),
+                'environment_name' => data_get($this, 'environment.name'),
+                'application_uuid' => data_get($this, 'uuid'),
+                'task_uuid' => $task_uuid
+            ]);
+        }
+        return null;
+    }
     public function settings()
     {
         return $this->hasOne(ApplicationSetting::class);
@@ -879,7 +891,7 @@ class Application extends BaseModel
         if (!$composeFileContent) {
             $this->docker_compose_location = $initialDockerComposeLocation;
             $this->save();
-            throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile");
+            throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile<br><br>Check if you used the right extension (.yaml or .yml) in the compose file name.");
         } else {
             $this->docker_compose_raw = $composeFileContent;
             $this->save();

app/Models/Environment.php

@@ -8,6 +8,18 @@ use Illuminate\Database\Eloquent\Model;
 class Environment extends Model
 {
     protected $guarded = [];
+
+    protected static function booted()
+    {
+        static::deleting(function ($environment) {
+            $shared_variables = $environment->environment_variables();
+            foreach ($shared_variables as $shared_variable) {
+                ray('Deleting environment shared variable: ' . $shared_variable->name);
+                $shared_variable->delete();
+            }
+
+        });
+    }
     public function isEmpty()
     {
         return $this->applications()->count() == 0 &&

app/Models/Project.php

@@ -25,6 +25,11 @@ class Project extends BaseModel
         static::deleting(function ($project) {
             $project->environments()->delete();
             $project->settings()->delete();
+            $shared_variables = $project->environment_variables();
+            foreach ($shared_variables as $shared_variable) {
+                ray('Deleting project shared variable: ' . $shared_variable->name);
+                $shared_variable->delete();
+            }
         });
     }
     public function environment_variables()
@@ -55,6 +60,7 @@ class Project extends BaseModel
         return $this->hasManyThrough(Application::class, Environment::class);
     }
 
+
     public function postgresqls()
     {
         return $this->hasManyThrough(StandalonePostgresql::class, Environment::class);
@@ -91,4 +97,7 @@ class Project extends BaseModel
     {
         return $this->applications()->count() + $this->postgresqls()->count() + $this->redis()->count() + $this->mongodbs()->count() + $this->mysqls()->count() + $this->mariadbs()->count() + $this->keydbs()->count() + $this->dragonflies()->count()  + $this->services()->count() + $this->clickhouses()->count();
     }
+    public function databases() {
+        return $this->postgresqls()->get()->merge($this->redis()->get())->merge($this->mongodbs()->get())->merge($this->mysqls()->get())->merge($this->mariadbs()->get())->merge($this->keydbs()->get())->merge($this->dragonflies()->get())->merge($this->clickhouses()->get());
+    }
 }

app/Models/Service.php

@@ -653,6 +653,18 @@ class Service extends BaseModel
         }
         return null;
     }
+    public function failedTaskLink($task_uuid)
+    {
+        if (data_get($this, 'environment.project.uuid')) {
+            return route('project.service.scheduled-tasks', [
+                'project_uuid' => data_get($this, 'environment.project.uuid'),
+                'environment_name' => data_get($this, 'environment.name'),
+                'application_uuid' => data_get($this, 'uuid'),
+                'task_uuid' => $task_uuid
+            ]);
+        }
+        return null;
+    }
     public function documentation()
     {
         $services = getServiceTemplates();

app/Models/Team.php

@@ -26,6 +26,34 @@ class Team extends Model implements SendsDiscord, SendsEmail
                 throw new \Exception('You are not allowed to update this team.');
             }
         });
+
+        static::deleting(function ($team) {
+            $keys = $team->privateKeys;
+            foreach ($keys as $key) {
+                ray('Deleting key: ' . $key->name);
+                $key->delete();
+            }
+            $sources = $team->sources();
+            foreach ($sources as $source) {
+                ray('Deleting source: ' . $source->name);
+                $source->delete();
+            }
+            $tags = Tag::whereTeamId($team->id)->get();
+            foreach ($tags as $tag) {
+                ray('Deleting tag: ' . $tag->name);
+                $tag->delete();
+            }
+            $shared_variables = $team->environment_variables();
+            foreach ($shared_variables as $shared_variable) {
+                ray('Deleting team shared variable: ' . $shared_variable->name);
+                $shared_variable->delete();
+            }
+            $s3s = $team->s3s;
+            foreach ($s3s as $s3) {
+                ray('Deleting s3: ' . $s3->name);
+                $s3->delete();
+            }
+        });
     }
 
     public function routeNotificationForDiscord()

app/Notifications/Channels/TelegramChannel.php

@@ -32,6 +32,9 @@ class TelegramChannel
             case 'App\Notifications\Database\BackupFailed':
                 $topicId = data_get($notifiable, 'telegram_notifications_database_backups_message_thread_id');
                 break;
+            case 'App\Notifications\ScheduledTask\TaskFailed':
+                $topicId = data_get($notifiable, 'telegram_notifications_scheduled_tasks_thread_id');
+                break;
         }
         if (!$telegramToken || !$chatId || !$message) {
             return;

app/Notifications/Container/ContainerRestarted.php

@@ -31,7 +31,7 @@ class ContainerRestarted extends Notification implements ShouldQueue
         $mail->view('emails.container-restarted', [
             'containerName' => $this->name,
             'serverName' => $this->server->name,
-            'url' => $this->url ,
+            'url' => $this->url,
         ]);
         return $mail;
     }

app/Notifications/ScheduledTask/TaskFailed.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Notifications\ScheduledTask;
+
+use App\Models\ScheduledTask;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class TaskFailed extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public $backoff = 10;
+    public $tries = 2;
+
+    public ?string $url = null;
+
+    public function __construct(public ScheduledTask $task, public string $output)
+    {
+        if ($task->application) {
+            $this->url = $task->application->failedTaskLink($task->uuid);
+        } else if ($task->service) {
+            $this->url = $task->service->failedTaskLink($task->uuid);
+        }
+    }
+
+    public function via(object $notifiable): array
+    {
+
+        return setNotificationChannels($notifiable, 'scheduled_tasks');
+    }
+
+    public function toMail(): MailMessage
+    {
+        $mail = new MailMessage();
+        $mail->subject("Coolify: [ACTION REQUIRED] Scheduled task ({$this->task->name}) failed.");
+        $mail->view('emails.scheduled-task-failed', [
+            'task' => $this->task,
+            'url' => $this->url,
+            'output' => $this->output,
+        ]);
+        return $mail;
+    }
+
+    public function toDiscord(): string
+    {
+        return "Coolify: Scheduled task ({$this->task->name}, [link]({$this->url})) failed with output: {$this->output}";
+    }
+    public function toTelegram(): array
+    {
+        $message = "Coolify: Scheduled task ({$this->task->name}) failed with output: {$this->output}";
+        if ($this->url) {
+            $buttons[] = [
+                "text" => "Open task in Coolify",
+                "url" => (string) $this->url
+            ];
+        }
+        return [
+            "message" => $message,
+        ];
+    }
+}

bootstrap/helpers/shared.php

@@ -95,6 +95,9 @@ function currentTeam()
 
 function showBoarding(): bool
 {
+    if (auth()->user()?->isMember()) {
+        return false;
+    }
     return currentTeam()->show_boarding ?? false;
 }
 function refreshSession(?Team $team = null): void
@@ -1232,13 +1235,13 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
             try {
                 $yaml = Yaml::parse($resource->docker_compose_pr_raw);
             } catch (\Exception $e) {
-                throw new \Exception($e->getMessage());
+                return;
             }
         } else {
             try {
                 $yaml = Yaml::parse($resource->docker_compose_raw);
             } catch (\Exception $e) {
-                throw new \Exception($e->getMessage());
+                return;
             }
         }
         $server = $resource->destination->server;

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

database/migrations/2024_05_21_125739_add_scheduled_tasks_notification_to_teams.php

@@ -0,0 +1,34 @@
+<?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('teams', function (Blueprint $table) {
+            $table->boolean('telegram_notifications_scheduled_tasks')->default(true);
+            $table->boolean('smtp_notifications_scheduled_tasks')->default(false)->after('smtp_notifications_status_changes');
+            $table->boolean('discord_notifications_scheduled_tasks')->default(true)->after('discord_notifications_status_changes');
+            $table->text('telegram_notifications_scheduled_tasks_thread_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('teams', function (Blueprint $table) {
+            $table->dropColumn('telegram_notifications_scheduled_tasks');
+            $table->dropColumn('smtp_notifications_scheduled_tasks');
+            $table->dropColumn('discord_notifications_scheduled_tasks');
+            $table->dropColumn('telegram_notifications_scheduled_tasks_thread_id');
+        });
+    }
+};

database/seeders/TestTeamSeeder.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Database\Seeder;
+
+class TestTeamSeeder extends Seeder
+{
+    public function run(): void
+    {
+        // User has 2 teams, 1 personal, 1 other where it is the owner and no other members are in the team
+        $user = User::factory()->create([
+            'name' => '1 personal, 1 other team, owner, no other members',
+            'email' => '1@example.com',
+        ]);
+        $team = Team::create([
+            'name' => "1@example.com",
+            'personal_team' => false,
+            'show_boarding' => true
+        ]);
+        $user->teams()->attach($team, ['role' => 'owner']);
+
+        // User has 2 teams, 1 personal, 1 other where it is the owner and 1 other member is in the team
+        $user = User::factory()->create([
+            'name' => 'owner: 1 personal, 1 other team, owner, 1 other member',
+            'email' => '2@example.com',
+        ]);
+        $team = Team::create([
+            'name' => "2@example.com",
+            'personal_team' => false,
+            'show_boarding' => true
+        ]);
+        $user->teams()->attach($team, ['role' => 'owner']);
+        $user = User::factory()->create([
+            'name' => 'member: 1 personal, 1 other team, owner, 1 other member',
+            'email' => '3@example.com',
+        ]);
+        $team->members()->attach($user, ['role' => 'member']);
+    }
+}

resources/css/app.css

@@ -41,7 +41,7 @@ option {
 }
 
 .button {
-    @apply flex items-center justify-center gap-2 px-2 py-1 text-sm text-black normal-case border rounded cursor-pointer bg-neutral-200/50 border-neutral-300 hover:bg-neutral-300 dark:bg-coolgray-200 dark:text-white dark:hover:text-white dark:hover:bg-coolgray-500 dark:border-black hover:text-black disabled:cursor-not-allowed min-w-fit focus:outline-1 dark:disabled:text-neutral-600 disabled:border-none disabled:hover:bg-transparent disabled:bg-transparent disabled:text-neutral-300;
+    @apply flex items-center justify-center gap-2 px-2 py-1 text-sm text-black normal-case border rounded cursor-pointer bg-neutral-200/50 border-neutral-300 hover:bg-neutral-300 dark:bg-coolgray-200 dark:text-white dark:hover:text-white dark:hover:bg-coolgray-500 dark:border-coolgray-300 hover:text-black disabled:cursor-not-allowed min-w-fit focus:outline-1 dark:disabled:text-neutral-600 disabled:border-none disabled:hover:bg-transparent disabled:bg-transparent disabled:text-neutral-300;
 }
 
 button[isError]:not(:disabled) {

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

@@ -15,6 +15,12 @@
                 href="{{ route('team.member.index') }}">
                 <button>Members</button>
             </a>
+            @if (isInstanceAdmin())
+                <a class="{{ request()->routeIs('team.admin-view') ? 'dark:text-white' : '' }}"
+                    href="{{ route('team.admin-view') }}">
+                    <button>Admin View</button>
+                </a>
+            @endif
             <div class="flex-1"></div>
         </nav>
     </div>

resources/views/emails/scheduled-task-failed.blade.php

@@ -0,0 +1,9 @@
+<x-emails.layout>
+Scheduled task ({{ $task->name }}) was FAILED with the following error:
+
+<pre>
+{{ $output }}
+</pre>
+
+Click [here]({{ $url }}) to view the task.
+</x-emails.layout>

resources/views/livewire/notifications/discord.blade.php

@@ -32,6 +32,8 @@
                 label="Application Deployments" />
             <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_database_backups"
                 label="Backup Status" />
+            <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_scheduled_tasks"
+                label="Scheduled Tasks Status" />
         </div>
     @endif
 </div>

resources/views/livewire/notifications/email.blade.php

@@ -111,6 +111,8 @@
                 label="Application Deployments" />
             <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_database_backups"
                 label="Backup Status" />
+            <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_scheduled_tasks"
+                label="Scheduled Tasks Status" />
         </div>
     @endif
 </div>

resources/views/livewire/notifications/telegram.blade.php

@@ -60,6 +60,15 @@
                         helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
                         id="team.telegram_notifications_database_backups_message_thread_id" label="Custom Topic ID" />
                 </div>
+                <div class="flex flex-col">
+                    <h4>Scheduled Tasks Status</h4>
+                    <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_scheduled_tasks"
+                    label="Enabled" />
+                    <x-forms.input
+                        helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
+                        id="team.telegram_notifications_scheduled_tasks_thread_id" label="Custom Topic ID" />
+                </div>
+
             </div>
         @endif
     </form>

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

@@ -38,7 +38,11 @@
                         </div>
                     @endif
                     @if ($application->build_pack === 'dockercompose')
-                        @if (count($parsedServices) > 0 && !$application->settings->is_raw_compose_deployment_enabled)
+
+                        @if (
+                            !is_null($parsedServices) &&
+                                count($parsedServices) > 0 &&
+                                !$application->settings->is_raw_compose_deployment_enabled)
                             <h3 class="pt-6">Domains</h3>
                             @foreach (data_get($parsedServices, 'services') as $serviceName => $service)
                                 @if (!isDatabaseImage(data_get($service, 'image')))

resources/views/livewire/project/new/public-git-repository.blade.php

@@ -12,7 +12,7 @@
                 </div>
                 @if (!$branch_found)
                     <div class="px-2 pt-4">
-                        <div class="flex gap-1">
+                        <div class="flex flex-col pb-4">
                             <div>Preselect branch (eg: main):</div>
                             <div class='text-helper'>https://github.com/coollabsio/coolify-examples/tree/main</div>
                         </div>

resources/views/livewire/team/admin-view.blade.php

@@ -0,0 +1,29 @@
+<div>
+    <x-team.navbar />
+    <form wire:submit="submitSearch" class="flex flex-col gap-2 lg:flex-row">
+        <x-forms.input wire:model="search" placeholder="Search for a user" />
+        <x-forms.button type="submit">Search</x-forms.button>
+    </form>
+    <h3 class="pt-4">Users</h3>
+    <div class="flex flex-col gap-2 ">
+        @forelse ($users as $user)
+            <div class="flex items-center justify-center gap-2 bg-white box-without-bg dark:bg-coolgray-100">
+                <div>{{ $user->name }}</div>
+                <div>{{ $user->email }}</div>
+                <div class="flex-1"></div>
+                <div class="flex items-center justify-center gap-2 mx-4 text-xs font-bold ">
+                    <x-modal-confirmation isErrorButton action="delete({{ $user->id }})" buttonTitle="Delete">
+                        This will delete all resources (application, databases, services, configurations, servers,
+                        private keys, tags, etc.) from Coolify and <span
+                            class="font-bold text-red-500 dark:text-warning">from the server (if it's reachable)</span>.
+                        <br> <br>
+                        It is not reversible. <br><br>
+                        <div class="font-bold text-red-500 dark:text-white">Think twice!</div>
+                    </x-modal-confirmation>
+                </div>
+            </div>
+        @empty
+            <div>No users found other than the root.</div>
+        @endforelse
+    </div>
+</div>

resources/views/livewire/team/invite-link.blade.php

@@ -1,5 +1,5 @@
 <div>
-    <form wire:submit='viaLink' class="flex items-center gap-2">
+    <form wire:submit='viaLink' class="flex flex-col gap-2 lg:items-center lg:flex-row">
         <x-forms.input id="email" type="email" name="email" placeholder="Email" />
         <x-forms.select id="role" name="role">
             <option value="owner">Owner</option>

routes/web.php

@@ -82,7 +82,7 @@ use App\Livewire\Subscription\Show as SubscriptionShow;
 
 use App\Livewire\Tags\Index as TagsIndex;
 use App\Livewire\Tags\Show as TagsShow;
-
+use App\Livewire\Team\AdminView as TeamAdminView;
 use App\Livewire\Waitlist\Index as WaitlistIndex;
 use App\Models\ScheduledDatabaseBackupExecution;
 use Illuminate\Support\Facades\Storage;
@@ -160,6 +160,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
     Route::prefix('team')->group(function () {
         Route::get('/', TeamIndex::class)->name('team.index');
         Route::get('/members', TeamMemberIndex::class)->name('team.member.index');
+        Route::get('/admin', TeamAdminView::class)->name('team.admin-view');
     });
 
     Route::get('/command-center', CommandCenterIndex::class)->name('command-center');

scripts/install.sh

@@ -135,7 +135,6 @@ if [ "$SSH_PERMIT_ROOT_LOGIN" != "true" ]; then
     echo "WARNING: PermitRootLogin is not enabled in /etc/ssh/sshd_config."
     echo -e "It is set to $SSH_PERMIT_ROOT_LOGIN_CONFIG. Should be prohibit-password, yes or without-password.\n"
     echo -e "Please make sure it is set, otherwise Coolify cannot connect to the host system. \n"
-    echo "(Currently we only support root user to login via SSH, this will be changed in the future.)"
     echo "###############################################################################"
 fi
 

versions.json

@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.283"
+            "version": "4.0.0-beta.285"
         },
         "sentinel": {
             "version": "0.0.4"