Merge branch 'next' into fix/filebrowser-template

Author: andrasbacsai

app/Actions/Database/StartDragonfly.php

@@ -46,9 +46,6 @@ public function handle(StandaloneDragonfly $database)
                     'networks' => [
                         $this->database->destination->network,
                     ],
-                    'ulimits' => [
-                        'memlock' => '-1',
-                    ],
                     'labels' => [
                         'coolify.managed' => 'true',
                     ],

app/Livewire/Project/Shared/ExecuteContainerCommand.php

@@ -11,6 +11,8 @@
 
 class ExecuteContainerCommand extends Component
 {
+    public $selected_container = 'default';
+
     public $container;
 
     public Collection $containers;
@@ -83,11 +85,14 @@ public function loadContainers()
                     $containers = getCurrentApplicationContainerStatus($server, $this->resource->id, includePullrequests: true);
                 }
                 foreach ($containers as $container) {
-                    $payload = [
-                        'server' => $server,
-                        'container' => $container,
-                    ];
-                    $this->containers = $this->containers->push($payload);
+                    // if container state is running
+                    if (data_get($container, 'State') === 'running') {
+                        $payload = [
+                            'server' => $server,
+                            'container' => $container,
+                        ];
+                        $this->containers = $this->containers->push($payload);
+                    }
                 }
             } elseif (data_get($this->parameters, 'database_uuid')) {
                 if ($this->resource->isRunning()) {
@@ -100,7 +105,6 @@ public function loadContainers()
                 }
             } elseif (data_get($this->parameters, 'service_uuid')) {
                 $this->resource->applications()->get()->each(function ($application) {
-                    ray($application);
                     if ($application->isRunning()) {
                         $this->containers->push([
                             'server' => $this->resource->server,
@@ -131,21 +135,26 @@ public function loadContainers()
     #[On('connectToContainer')]
     public function connectToContainer()
     {
+        if ($this->selected_container === 'default') {
+            $this->dispatch('error', 'Please select a container.');
+
+            return;
+        }
         try {
-            $container_name = data_get($this->container, 'container.Names');
-            if (is_null($container_name)) {
+            $container = collect($this->containers)->firstWhere('container.Names', $this->selected_container);
+            if (is_null($container)) {
                 throw new \RuntimeException('Container not found.');
             }
             $server = data_get($this->container, 'server');
 
             if ($server->isForceDisabled()) {
                 throw new \RuntimeException('Server is disabled.');
             }
-
-            $this->dispatch('send-terminal-command',
-                true,
-                $container_name,
-                $server->uuid,
+            $this->dispatch(
+                'send-terminal-command',
+                isset($container),
+                data_get($container, 'container.Names'),
+                data_get($container, 'server.uuid')
             );
 
         } catch (\Throwable $e) {

app/Models/EnvironmentVariable.php

@@ -126,11 +126,6 @@ public function realValue(): Attribute
                 $env = $this->get_real_environment_variables($this->value, $resource);
 
                 return data_get($env, 'value', $env);
-                if (is_string($env)) {
-                    return $env;
-                }
-
-                return $env->value;
             }
         );
     }

app/Models/InstanceSettings.php

@@ -85,4 +85,17 @@ public function getTitleDisplayName(): string
 
         return "[{$instanceName}]";
     }
+
+    public function helperVersion(): Attribute
+    {
+        return Attribute::make(
+            get: function () {
+                if (isDev()) {
+                    return 'latest';
+                }
+
+                return $this->helper_version;
+            }
+        );
+    }
 }

bootstrap/helpers/shared.php

@@ -1236,8 +1236,6 @@ function parseLineForSudo(string $command, Server $server): string
 function get_public_ips()
 {
     try {
-        echo "Refreshing public ips!\n";
-        $settings = \App\Models\InstanceSettings::get();
         [$first, $second] = Process::concurrently(function (Pool $pool) {
             $pool->path(__DIR__)->command('curl -4s https://ifconfig.io');
             $pool->path(__DIR__)->command('curl -6s https://ifconfig.io');
@@ -1251,7 +1249,7 @@ function get_public_ips()
 
                 return;
             }
-            $settings->update(['public_ipv4' => $ipv4]);
+            InstanceSettings::get()->update(['public_ipv4' => $ipv4]);
         }
     } catch (\Exception $e) {
         echo "Error: {$e->getMessage()}\n";
@@ -1266,7 +1264,7 @@ function get_public_ips()
 
                 return;
             }
-            $settings->update(['public_ipv6' => $ipv6]);
+            InstanceSettings::get()->update(['public_ipv6' => $ipv6]);
         }
     } catch (\Throwable $e) {
         echo "Error: {$e->getMessage()}\n";
@@ -3828,6 +3826,21 @@ function convertComposeEnvironmentToArray($environment)
 {
     $convertedServiceVariables = collect([]);
     if (isAssociativeArray($environment)) {
+        if ($environment instanceof Collection) {
+            $changedEnvironment = collect([]);
+            $environment->each(function ($value, $key) use ($changedEnvironment) {
+                $parts = explode('=', $value, 2);
+                if (count($parts) === 2) {
+                    $key = $parts[0];
+                    $realValue = $parts[1] ?? '';
+                    $changedEnvironment->put($key, $realValue);
+                } else {
+                    $changedEnvironment->put($key, $value);
+                }
+            });
+
+            return $changedEnvironment;
+        }
         $convertedServiceVariables = $environment;
     } else {
         foreach ($environment as $value) {

composer.json

@@ -48,6 +48,7 @@
         "zircote/swagger-php": "^4.10"
     },
     "require-dev": {
+        "barryvdh/laravel-debugbar": "^3.13",
         "fakerphp/faker": "^v1.21.0",
         "laravel/dusk": "^v8.0",
         "laravel/pint": "^1.16",

composer.lock

@@ -19,7 +19,6 @@ public function run()
 
             PrivateKey::chunk(100, function ($keys) {
                 foreach ($keys as $key) {
-                    echo 'Storing key: '.$key->name."\n";
                     $key->storeInFileSystem();
                 }
             });

database/seeders/PopulateSshKeysDirectorySeeder.php

@@ -101,18 +101,13 @@ public function run(): void
         }
 
         if (! isCloud() && config('coolify.is_windows_docker_desktop') == false) {
-            echo "Checking localhost key.\n";
             $coolify_key_name = '@host.docker.internal';
             $ssh_keys_directory = Storage::disk('ssh-keys')->files();
             $coolify_key = collect($ssh_keys_directory)->firstWhere(fn ($item) => str($item)->contains($coolify_key_name));
 
-            $found = PrivateKey::find(0);
-            if ($found) {
-                echo 'Private Key found in database.\n';
-                if ($coolify_key) {
-                    echo "SSH key found for the Coolify host machine (localhost).\n";
-                }
-            } else {
+            $server = Server::find(0);
+            $found = $server->privateKey;
+            if (! $found) {
                 if ($coolify_key) {
                     $user = str($coolify_key)->before('@')->after('id.');
                     $coolify_key = Storage::disk('ssh-keys')->get($coolify_key);
@@ -125,17 +120,7 @@ public function run(): void
                     ]);
                     $server->update(['user' => $user]);
                     echo "SSH key found for the Coolify host machine (localhost).\n";
-
                 } else {
-                    PrivateKey::create(
-                        [
-                            'id' => 0,
-                            'team_id' => 0,
-                            'name' => 'localhost\'s key',
-                            'description' => 'The private key for the Coolify host machine (localhost).',
-                            'private_key' => 'Paste here you private key!!',
-                        ]
-                    );
                     echo "No SSH key found for the Coolify host machine (localhost).\n";
                     echo "Please read the following documentation (point 3) to fix it: https://coolify.io/docs/knowledge-base/server/openssh/\n";
                     echo "Your localhost connection won't work until then.";