Merge pull request #1539 from coollabsio/next

v4.0.0-beta.161

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

@@ -267,7 +267,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     "ignore_errors" => true,
                 ]
             );
-            ApplicationStatusChanged::dispatch(data_get($this->application,'environment.project.team.id'));
+            ApplicationStatusChanged::dispatch(data_get($this->application, 'environment.project.team.id'));
         }
     }
     private function push_to_docker_registry()
@@ -874,6 +874,20 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $environment_variables = $this->generate_environment_variables($ports);
 
         if (data_get($this->application, 'custom_labels')) {
+            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 {
+                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();
+            }
+
+            if (mb_detect_encoding(base64_decode($this->application->custom_labels), 'ASCII', true) === false) {
+                ray('custom_labels contains non-ascii characters');
+                $this->application->custom_labels = base64_encode(str(implode(",", generateLabelsApplication($this->application, $this->preview)))->replace(',', "\n"));
+                $this->application->save();
+            }
             $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.');
@@ -1247,7 +1261,8 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         }
     }
 
-    private function build_by_compose_file() {
+    private function build_by_compose_file()
+    {
         $this->application_deployment_queue->addLogEntry("Pulling & building required images.");
         if ($this->application->build_pack === 'dockerimage') {
             $this->application_deployment_queue->addLogEntry("Pulling latest images from the registry.");

app/Livewire/Project/Application/General.php

@@ -110,16 +110,23 @@ class General extends Component
         }
         $this->isConfigurationChanged = $this->application->isConfigurationChanged();
 
-        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 {
-            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();
+        if (data_get($this->application, 'custom_labels')) {
+            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 {
+                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'));
+            // // Fix for non-ascii characters
+            if (mb_detect_encoding($this->customLabels, 'ASCII', true) === false) {
+                ray('custom_labels contains non-ascii characters');
+                $this->resetDefaultLabels(false);
+            }
         }
 
-        $this->customLabels = base64_decode(data_get($this->application, 'custom_labels'));
         $this->initialDockerComposeLocation = $this->application->docker_compose_location;
         $this->checkLabelUpdates();
     }
@@ -242,7 +249,6 @@ class General extends Component
                 $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!');

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

versions.json

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