Merge pull request #1536 from coollabsio/next

v4.0.0-beta.158

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,7 +161,8 @@ function setup_dynamic_configuration()
 {
     $dynamic_config_path = get_proxy_path() . "/dynamic";
     $settings = InstanceSettings::get();
-    $server = Server::findOrFail(0);
+    $server = Server::find(0);
+    if ($server) {
         $file = "$dynamic_config_path/coolify.yaml";
         if (empty($settings->fqdn)) {
             instant_remote_process([
@@ -267,6 +268,7 @@ function setup_dynamic_configuration()
                 ray($yaml);
             }
         }
+    }
 }
 function setup_default_redirect_404(string|null $redirect_url, Server $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.157',
+    'release' => '4.0.0-beta.158',
     // 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.158';

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.158"
         }
     }
 }