Merge pull request #1560 from coollabsio/next

v4.0.0-beta.169

app/Jobs/ContainerStatusJob.php

@@ -22,10 +22,10 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $tries = 5;
+    public $tries = 4;
     public function backoff(): int
     {
-        return isDev() ? 1 : 5;
+        return isDev() ? 1 : 3;
     }
     public function middleware(): array
     {

app/Jobs/ServerStatusJob.php

@@ -17,22 +17,30 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public ?int $disk_usage = null;
+    public $tries = 4;
+    public function backoff(): int
+    {
+        return isDev() ? 1 : 3;
+    }
     public function __construct(public Server $server)
     {
     }
     public function middleware(): array
     {
-        return [(new WithoutOverlapping($this->server->id))->dontRelease()];
+        return [(new WithoutOverlapping($this->server->uuid))];
     }
 
     public function uniqueId(): int
     {
-        return $this->server->id;
+        return $this->server->uuid;
     }
 
-    public function handle(): void
+    public function handle()
     {
         ray("checking server status for {$this->server->id}");
+        if (!$this->server->isServerReady(4)) {
+            throw new \RuntimeException('Server is not reachable.');
+        };
         try {
             if ($this->server->isFunctional()) {
                 $this->cleanup(notify: false);
@@ -40,7 +48,7 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
         } catch (\Throwable $e) {
             send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage());
             ray($e->getMessage());
-            handleError($e);
+            return handleError($e);
         }
     }
     public function cleanup(bool $notify = false): void

app/Livewire/Project/Shared/EnvironmentVariable/Show.php

@@ -65,7 +65,11 @@ class Show extends Component
 
     public function delete()
     {
-        $this->env->delete();
-        $this->dispatch('refreshEnvs');
+        try {
+            $this->env->delete();
+            $this->dispatch('refreshEnvs');
+        } catch (\Exception $e) {
+            return handleError($e);
+        }
     }
 }

app/Livewire/Project/Shared/GetLogs.php

@@ -73,9 +73,17 @@ class GetLogs extends Component
         if (!$refresh && $this->resource?->getMorphClass() === 'App\Models\Service') return;
         if ($this->container) {
             if ($this->showTimeStamps) {
-                $sshCommand = generateSshCommand($this->server, "docker logs -n {$this->numberOfLines} -t {$this->container}");
+                if ($this->server->isSwarm()) {
+                    $sshCommand = generateSshCommand($this->server, "docker service logs -n {$this->numberOfLines} -t {$this->container}");
+                } else {
+                    $sshCommand = generateSshCommand($this->server, "docker logs -n {$this->numberOfLines} -t {$this->container}");
+                }
             } else {
-                $sshCommand = generateSshCommand($this->server, "docker logs -n {$this->numberOfLines} {$this->container}");
+                if ($this->server->isSwarm()) {
+                    $sshCommand = generateSshCommand($this->server, "docker service logs -n {$this->numberOfLines} {$this->container}");
+                } else {
+                    $sshCommand = generateSshCommand($this->server, "docker logs -n {$this->numberOfLines} {$this->container}");
+                }
             }
             if ($refresh) {
                 $this->outputs = '';

app/Livewire/Project/Shared/Logs.php

@@ -34,7 +34,15 @@ class Logs extends Component
             $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
             $this->status = $this->resource->status;
             $this->server = $this->resource->destination->server;
-            $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
+            if ($this->server->isSwarm()) {
+                $containers = collect([
+                    [
+                        'Names' => $this->resource->uuid . '_' . $this->resource->uuid,
+                    ]
+                ]);
+            } else {
+                $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
+            }
             if ($containers->count() > 0) {
                 $containers->each(function ($container) {
                     $this->containers->push(str_replace('/', '', $container['Names']));
@@ -62,7 +70,7 @@ class Logs extends Component
             $this->status = $this->resource->status;
             $this->server = $this->resource->destination->server;
             $this->container = $this->resource->uuid;
-            if (str(data_get($this,'resource.status'))->startsWith('running')) {
+            if (str(data_get($this, 'resource.status'))->startsWith('running')) {
                 $this->containers->push($this->container);
             }
         } else if (data_get($this->parameters, 'service_uuid')) {

app/Livewire/Project/Shared/Storages/Add.php

@@ -31,14 +31,16 @@ class Add extends Component
     public function mount()
     {
         $this->parameters = get_route_parameters();
-        $applicationUuid = $this->parameters['application_uuid'];
-        $application = Application::where('uuid', $applicationUuid)->first();
-        if (!$application) {
-            abort(404);
-        }
-        if ($application->destination->server->isSwarm()) {
-            $this->isSwarm = true;
-            $this->rules['host_path'] = 'required|string';
+        if (data_get($this->parameters, 'application_uuid')) {
+            $applicationUuid = $this->parameters['application_uuid'];
+            $application = Application::where('uuid', $applicationUuid)->first();
+            if (!$application) {
+                abort(404);
+            }
+            if ($application->destination->server->isSwarm()) {
+                $this->isSwarm = true;
+                $this->rules['host_path'] = 'required|string';
+            }
         }
     }
 

app/Livewire/Server/New/ByIp.php

@@ -93,7 +93,7 @@ class ByIp extends Component
             $server->settings->is_swarm_worker = $this->is_swarm_worker;
             $server->settings->save();
             $server->addInitialNetwork();
-            return $this->redirectRoute('server.show', $server->uuid, navigate: true);
+            return $this->redirectRoute('server.show', $server->uuid);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Models/Server.php

@@ -151,7 +151,12 @@ class Server extends BaseModel
     }
     public function isServerReady(int $tries = 3)
     {
-        $serverUptimeCheckNumber = $this->unreachable_count + 1;
+        if ($this->skipServer()) {
+            return false;
+        }
+        if ($this->unreachable_count < $tries) {
+            $serverUptimeCheckNumber = $this->unreachable_count + 1;
+        }
         $serverUptimeCheckNumberMax = $tries;
 
         ray('server: ' . $this->name);

bootstrap/helpers/docker.php

@@ -14,20 +14,23 @@ use Visus\Cuid2\Cuid2;
 function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pullRequestId = null): Collection
 {
     $containers = collect([]);
-    $containers = instant_remote_process(["docker ps -a --filter='label=coolify.applicationId={$id}' --format '{{json .}}' "], $server);
-    $containers = format_docker_command_output_to_json($containers);
-    $containers = $containers->map(function ($container) use ($pullRequestId) {
-        $labels = data_get($container, 'Labels');
-        if (!str($labels)->contains("coolify.pullRequestId=")) {
-            data_set($container, 'Labels', $labels . ",coolify.pullRequestId={$pullRequestId}");
-            return $container;
-        }
-        if (str($labels)->contains("coolify.pullRequestId=$pullRequestId")) {
-            return $container;
-        }
-        return null;
-    });
-    $containers = $containers->filter();
+    if (!$server->isSwarm()) {
+        $containers = instant_remote_process(["docker ps -a --filter='label=coolify.applicationId={$id}' --format '{{json .}}' "], $server);
+        $containers = format_docker_command_output_to_json($containers);
+        $containers = $containers->map(function ($container) use ($pullRequestId) {
+            $labels = data_get($container, 'Labels');
+            if (!str($labels)->contains("coolify.pullRequestId=")) {
+                data_set($container, 'Labels', $labels . ",coolify.pullRequestId={$pullRequestId}");
+                return $container;
+            }
+            if (str($labels)->contains("coolify.pullRequestId=$pullRequestId")) {
+                return $container;
+            }
+            return null;
+        });
+        $containers = $containers->filter();
+        return $containers;
+    }
     return $containers;
 }
 

bootstrap/helpers/shared.php

@@ -1330,7 +1330,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                 if ($value?->startsWith('$')) {
                     $foundEnv = EnvironmentVariable::where([
                         'key' => $key,
-                        'service_id' => $resource->id,
+                        'application_id' => $resource->id,
+                        'is_preview' => false,
                     ])->first();
                     $value = Str::of(replaceVariables($value));
                     $key = $value;
@@ -1397,14 +1398,22 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             $defaultValue = data_get($foundEnv, 'value');
                         }
                         $isBuildTime = data_get($foundEnv, 'is_build_time', false);
-                        EnvironmentVariable::updateOrCreate([
-                            'key' => $key->value(),
-                            'application_id' => $resource->id,
-                        ], [
-                            'value' => $defaultValue,
-                            'is_build_time' => $isBuildTime,
-                            'application_id' => $resource->id,
-                        ]);
+                        if ($foundEnv) {
+                            $foundEnv->update([
+                                'key' => $key,
+                                'application_id' => $resource->id,
+                                'is_build_time' => $isBuildTime,
+                                'value' => $defaultValue,
+                            ]);
+                        } else {
+                            EnvironmentVariable::create([
+                                'key' => $key,
+                                'value' => $defaultValue,
+                                'is_build_time' => $isBuildTime,
+                                'application_id' => $resource->id,
+                                'is_preview' => false,
+                            ]);
+                        }
                     }
                 }
             }

config/horizon.php

@@ -216,7 +216,7 @@ return [
             ],
             'long-running' => [
                 'autoScalingStrategy' => 'size',
-                'maxProcesses' => env('HORIZON_MAX_PROCESSES', 2),
+                'maxProcesses' => env('HORIZON_MAX_PROCESSES', 6),
                 'balanceMaxShift' => env('HORIZON_BALANCE_MAX_SHIFT', 1),
                 'balanceCooldown' => env('HORIZON_BALANCE_COOLDOWN', 1),
             ],
@@ -231,7 +231,7 @@ return [
             ],
             'long-running' => [
                 'autoScalingStrategy' => 'size',
-                'maxProcesses' => env('HORIZON_MAX_PROCESSES', 2),
+                'maxProcesses' => env('HORIZON_MAX_PROCESSES', 6),
                 'balanceMaxShift' => env('HORIZON_BALANCE_MAX_SHIFT', 1),
                 'balanceCooldown' => env('HORIZON_BALANCE_COOLDOWN', 1),
             ],

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

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

@@ -3,10 +3,12 @@
         href="{{ route('project.application.configuration', $parameters) }}">
         <button>Configuration</button>
     </a>
+    @if(!$application->destination->server->isSwarm())
     <a wire:navigate class="{{ request()->routeIs('project.application.command') ? 'text-white' : '' }}"
         href="{{ route('project.application.command', $parameters) }}">
         <button>Execute Command</button>
     </a>
+    @endif
     <a wire:navigate class="{{ request()->routeIs('project.application.logs') ? 'text-white' : '' }}"
         href="{{ route('project.application.logs', $parameters) }}">
         <button>Logs</button>

resources/views/livewire/project/new/select.blade.php

@@ -202,14 +202,14 @@
                 <li class="step step-secondary">Select a Server</li>
                 <li class="step">Select a Destination</li>
             </ul>
-            @if ($isDatabase)
+            {{-- @if ($isDatabase)
                 <div class="flex items-center justify-center pt-4">
                     <x-forms.checkbox instantSave wire:model="includeSwarm"
                         helper="Swarm clusters are excluded from this list by default. For database, services or complex compose deployments with databases to work with Swarm,
                 you need to set a few things on the server. Read more <a class='text-white underline' href='https://coolify.io/docs/swarm#database-requirements' target='_blank'>here</a>."
                         label="Include Swarm Clusters" />
                 </div>
-            @endif
+            @endif --}}
             <div class="flex flex-col justify-center gap-2 text-left xl:flex-row xl:flex-wrap">
                 @forelse($servers as $server)
                     <div class="box group" wire:click="setServer({{ $server }})">

resources/views/livewire/server/new/by-ip.blade.php

@@ -25,8 +25,8 @@
                     @endif
                 @endforeach
             </x-forms.select>
-            <div class="w-72">
-                <div class="pt-6"> Swarm support is in alpha version. </div>
+            <div class="w-96">
+                <div class="pt-6"> Swarm support is in alpha version. Read the docs <a class='text-white' href='https://coolify.io/docs/swarm#deploy-with-persistent-storage' target='_blank'>here</a>.</div>
                 @if ($is_swarm_worker)
                     <x-forms.checkbox disabled instantSave type="checkbox" id="is_swarm_manager"
                         helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/swarm' target='_blank'>here</a>."
@@ -45,24 +45,23 @@
                         helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/swarm' target='_blank'>here</a>."
                         label="Is it a Swarm Worker?" />
                 @endif
-                @if ($is_swarm_worker)
-                <div class="py-4">
-                    <x-forms.select label="Select a Swarm Cluster" id="selected_swarm_cluster" required>
-                        @foreach ($swarm_managers as $server)
-                            @if ($loop->first)
-                                <option selected value="{{ $server->id }}">{{ $server->name }}</option>
-                            @else
-                                <option value="{{ $server->id }}">{{ $server->name }}</option>
-                            @endif
-                        @endforeach
-                    </x-forms.select>
-                </div>
+                @if ($is_swarm_worker && count($swarm_managers) > 0)
+                    <div class="py-4">
+                        <x-forms.select label="Select a Swarm Cluster" id="selected_swarm_cluster" required>
+                            @foreach ($swarm_managers as $server)
+                                @if ($loop->first)
+                                    <option selected value="{{ $server->id }}">{{ $server->name }}</option>
+                                @else
+                                    <option value="{{ $server->id }}">{{ $server->name }}</option>
+                                @endif
+                            @endforeach
+                        </x-forms.select>
+                    </div>
                 @endif
             </div>
             <x-forms.button type="submit">
-                Save New Server
+                Save Server
             </x-forms.button>
         </form>
-
     @endif
 </div>

versions.json

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