Merge pull request #1538 from coollabsio/next

v4.0.0-beta.160

app/Console/Commands/Init.php

@@ -35,7 +35,12 @@ class Init extends Command
         }
         $this->cleanup_in_progress_application_deployments();
         $this->cleanup_stucked_helper_containers();
-        setup_dynamic_configuration();
+
+        try {
+            setup_dynamic_configuration();
+        } catch (\Throwable $e) {
+            echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
+        }
 
         $settings = InstanceSettings::get();
         if (!is_null(env('AUTOUPDATE', null))) {

app/Jobs/ApplicationDeploymentJob.php

@@ -874,11 +874,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $environment_variables = $this->generate_environment_variables($ports);
 
         if (data_get($this->application, 'custom_labels')) {
-            $labels = collect(str($this->application->custom_labels)->explode(','));
+            $labels = collect(preg_split("/\r\n|\n|\r/", base64_decode($this->application->custom_labels)));
             $labels = $labels->filter(function ($value, $key) {
                 return !Str::startsWith($value, 'coolify.');
             });
-            $this->application->custom_labels = $labels->implode(',');
+            $this->application->custom_labels = base64_encode($labels->implode("\n"));
             $this->application->save();
         } else {
             $labels = collect(generateLabelsApplication($this->application, $this->preview));

app/Livewire/Project/Application/General.php

@@ -95,7 +95,6 @@ class General extends Component
         'application.dockerfile_target_build' => 'Dockerfile target build',
         'application.settings.is_static' => 'Is static',
     ];
-
     public function mount()
     {
         try {
@@ -110,11 +109,17 @@ class General extends Component
             $this->application->isConfigurationChanged(true);
         }
         $this->isConfigurationChanged = $this->application->isConfigurationChanged();
-        if (is_null(data_get($this->application, 'custom_labels'))) {
+
-            $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+        if (base64_encode(base64_decode(data_get($this->application, 'custom_labels'), true)) === data_get($this->application, 'custom_labels')) {
+            ray('custom_labels is base64 encoded');
         } else {
-            $this->customLabels = str($this->application->custom_labels)->replace(',', "\n");
+            ray('custom_labels is not base64 encoded');
+            $this->application->custom_labels = str($this->application->custom_labels)->replace(',', "\n");
+            $this->application->custom_labels = base64_encode(data_get($this->application, 'custom_labels'));
+            $this->application->save();
         }
+
+        $this->customLabels = base64_decode(data_get($this->application, 'custom_labels'));
         $this->initialDockerComposeLocation = $this->application->docker_compose_location;
         $this->checkLabelUpdates();
     }
@@ -233,14 +238,12 @@ class General extends Component
             if ($this->application->publish_directory && $this->application->publish_directory !== '/') {
                 $this->application->publish_directory = rtrim($this->application->publish_directory, '/');
             }
-            if (gettype($this->customLabels) === 'string') {
-                $this->customLabels = str($this->customLabels)->replace(',', "\n");
-            }
-            $this->application->custom_labels = $this->customLabels->explode("\n")->implode(',');
             if ($this->application->build_pack === 'dockercompose') {
                 $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
                 $this->parsedServices = $this->application->parseCompose();
             }
+
+            $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();
             $showToaster && $this->dispatch('success', 'Application settings updated!');
         } catch (\Throwable $e) {

bootstrap/helpers/proxy.php

@@ -161,110 +161,112 @@ function setup_dynamic_configuration()
 {
     $dynamic_config_path = get_proxy_path() . "/dynamic";
     $settings = InstanceSettings::get();
-    $server = Server::findOrFail(0);
+    $server = Server::find(0);
-    $file = "$dynamic_config_path/coolify.yaml";
+    if ($server) {
-    if (empty($settings->fqdn)) {
+        $file = "$dynamic_config_path/coolify.yaml";
-        instant_remote_process([
+        if (empty($settings->fqdn)) {
-            "rm -f $file",
+            instant_remote_process([
-        ], $server);
+                "rm -f $file",
-    } else {
+            ], $server);
-        $url = Url::fromString($settings->fqdn);
+        } else {
-        $host = $url->getHost();
+            $url = Url::fromString($settings->fqdn);
-        $schema = $url->getScheme();
+            $host = $url->getHost();
-        $traefik_dynamic_conf = [
+            $schema = $url->getScheme();
-            'http' =>
+            $traefik_dynamic_conf = [
-            [
+                'http' =>
-                'routers' =>
                 [
-                    'coolify-http' =>
+                    'routers' =>
                     [
-                        'entryPoints' => [
+                        'coolify-http' =>
-                            0 => 'http',
-                        ],
-                        'service' => 'coolify',
-                        'rule' => "Host(`{$host}`)",
-                    ],
-                    'coolify-realtime-ws' =>
-                    [
-                        'entryPoints' => [
-                            0 => 'http',
-                        ],
-                        'service' => 'coolify-realtime',
-                        'rule' => "Host(`{$host}`) && PathPrefix(`/app`)",
-                    ],
-                ],
-                'services' =>
-                [
-                    'coolify' =>
-                    [
-                        'loadBalancer' =>
                         [
-                            'servers' =>
+                            'entryPoints' => [
+                                0 => 'http',
+                            ],
+                            'service' => 'coolify',
+                            'rule' => "Host(`{$host}`)",
+                        ],
+                        'coolify-realtime-ws' =>
+                        [
+                            'entryPoints' => [
+                                0 => 'http',
+                            ],
+                            'service' => 'coolify-realtime',
+                            'rule' => "Host(`{$host}`) && PathPrefix(`/app`)",
+                        ],
+                    ],
+                    'services' =>
+                    [
+                        'coolify' =>
+                        [
+                            'loadBalancer' =>
                             [
-                                0 =>
+                                'servers' =>
                                 [
-                                    'url' => 'http://coolify:80',
+                                    0 =>
+                                    [
+                                        'url' => 'http://coolify:80',
+                                    ],
                                 ],
                             ],
                         ],
-                    ],
+                        'coolify-realtime' =>
-                    'coolify-realtime' =>
-                    [
-                        'loadBalancer' =>
                         [
-                            'servers' =>
+                            'loadBalancer' =>
                             [
-                                0 =>
+                                'servers' =>
                                 [
-                                    'url' => 'http://coolify-realtime:6001',
+                                    0 =>
+                                    [
+                                        'url' => 'http://coolify-realtime:6001',
+                                    ],
                                 ],
                             ],
                         ],
                     ],
                 ],
-            ],
-        ];
-
-        if ($schema === 'https') {
-            $traefik_dynamic_conf['http']['routers']['coolify-http']['middlewares'] = [
-                0 => 'redirect-to-https@docker',
             ];
 
-            $traefik_dynamic_conf['http']['routers']['coolify-https'] = [
+            if ($schema === 'https') {
-                'entryPoints' => [
+                $traefik_dynamic_conf['http']['routers']['coolify-http']['middlewares'] = [
-                    0 => 'https',
+                    0 => 'redirect-to-https@docker',
-                ],
+                ];
-                'service' => 'coolify',
-                'rule' => "Host(`{$host}`)",
-                'tls' => [
-                    'certresolver' => 'letsencrypt',
-                ],
-            ];
-            $traefik_dynamic_conf['http']['routers']['coolify-realtime-wss'] = [
-                'entryPoints' => [
-                    0 => 'https',
-                ],
-                'service' => 'coolify-realtime',
-                'rule' => "Host(`{$host}`) && PathPrefix(`/app`)",
-                'tls' => [
-                    'certresolver' => 'letsencrypt',
-                ],
-            ];
-        }
-        $yaml = Yaml::dump($traefik_dynamic_conf, 12, 2);
-        $yaml =
-            "# This file is automatically generated by Coolify.\n" .
-            "# Do not edit it manually (only if you know what are you doing).\n\n" .
-            $yaml;
 
-        $base64 = base64_encode($yaml);
+                $traefik_dynamic_conf['http']['routers']['coolify-https'] = [
-        instant_remote_process([
+                    'entryPoints' => [
-            "mkdir -p $dynamic_config_path",
+                        0 => 'https',
-            "echo '$base64' | base64 -d > $file",
+                    ],
-        ], $server);
+                    'service' => 'coolify',
+                    'rule' => "Host(`{$host}`)",
+                    'tls' => [
+                        'certresolver' => 'letsencrypt',
+                    ],
+                ];
+                $traefik_dynamic_conf['http']['routers']['coolify-realtime-wss'] = [
+                    'entryPoints' => [
+                        0 => 'https',
+                    ],
+                    'service' => 'coolify-realtime',
+                    'rule' => "Host(`{$host}`) && PathPrefix(`/app`)",
+                    'tls' => [
+                        'certresolver' => 'letsencrypt',
+                    ],
+                ];
+            }
+            $yaml = Yaml::dump($traefik_dynamic_conf, 12, 2);
+            $yaml =
+                "# This file is automatically generated by Coolify.\n" .
+                "# Do not edit it manually (only if you know what are you doing).\n\n" .
+                $yaml;
 
-        if (config('app.env') == 'local') {
+            $base64 = base64_encode($yaml);
-            ray($yaml);
+            instant_remote_process([
+                "mkdir -p $dynamic_config_path",
+                "echo '$base64' | base64 -d > $file",
+            ], $server);
+
+            if (config('app.env') == 'local') {
+                ray($yaml);
+            }
         }
     }
 }

bootstrap/helpers/shared.php

@@ -969,10 +969,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                 }
                             }
                         } else {
-                            $foundEnv = EnvironmentVariable::where([
-                                'key' => $key,
-                                'service_id' => $resource->id,
-                            ])->first();
                             if ($value->contains(':-')) {
                                 $key = $value->before(':');
                                 $defaultValue = $value->after(':-');
@@ -989,6 +985,10 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                 $key = $value;
                                 $defaultValue = null;
                             }
+                            $foundEnv = EnvironmentVariable::where([
+                                'key' => $key,
+                                'service_id' => $resource->id,
+                            ])->first();
                             if ($foundEnv) {
                                 $defaultValue = data_get($foundEnv, 'value');
                             }

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

database/seeders/ProductionSeeder.php

@@ -14,6 +14,7 @@ use App\Models\StandaloneDocker;
 use App\Models\Team;
 use App\Models\User;
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Facades\Storage;

docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-script/up

@@ -1,2 +1,3 @@
 #!/command/execlineb -P
+s6-setuidgid webuser
 php /var/www/html/artisan app:init

versions.json

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