Merge pull request #2016 from coollabsio/next

v4.0.0-beta.262

app/Jobs/ApplicationDeploymentJob.php

@@ -1239,8 +1239,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->pull_request_id !== 0) {
             $labels = collect(generateLabelsApplication($this->application, $this->preview));
         }
+        $labels = $labels->map(function ($value, $key) {
+            return escapeDollarSign($value);
+        });
         $labels = $labels->merge(defaultLabels($this->application->id, $this->application->uuid, $this->pull_request_id))->toArray();
-
         // Check for custom HEALTHCHECK
         $this->custom_healthcheck_found = false;
         if ($this->application->build_pack === 'dockerfile' || $this->application->dockerfile) {

app/Livewire/Settings/Configuration.php

@@ -69,13 +69,14 @@ class Configuration extends Component
             }
             $this->validate();
 
-            if ($this->settings->is_dns_validation_enabled) {
+            if ($this->settings->is_dns_validation_enabled && $this->settings->fqdn) {
+                ray('asdf');
                 if (!validate_dns_entry($this->settings->fqdn, $this->server)) {
                     $this->dispatch('error',  "Validating DNS ({$this->settings->fqdn}) failed.<br><br>Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
                     $error_show = true;
                 }
             }
-            check_domain_usage(domain: $this->settings->fqdn);
+            if ($this->settings->fqdn) check_domain_usage(domain: $this->settings->fqdn);
             $this->settings->custom_dns_servers = str($this->settings->custom_dns_servers)->replaceEnd(',', '')->trim();
             $this->settings->custom_dns_servers = str($this->settings->custom_dns_servers)->trim()->explode(',')->map(function ($dns) {
                 return str($dns)->trim()->lower();

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

templates/compose/appsmith.yaml

@@ -1,5 +1,5 @@
 # documentation: https://appsmith.com
-# slogan: Appsmith is low-code application platform for building internal tools.
+# slogan: A low-code application platform for building internal tools.
 # tags: lowcode,nocode,no,low,platform
 # logo: svgs/appsmith.svg
 

templates/compose/appwrite.yaml

@@ -1,5 +1,5 @@
 # documentation: https://appwrite.io
-# slogan: Appwrite is backend-as-a-service platform that simplifies the web & mobile app development.
+# slogan: A backend-as-a-service platform that simplifies the web & mobile app development.
 # env_file: appwrite.env
 # tags: backend-as-a-service, platform
 # logo: svgs/appwrite.svg

templates/compose/babybuddy.yaml

@@ -1,5 +1,5 @@
 # documentation: https://docs.baby-buddy.net
-# slogan: Baby Buddy helps parents track their baby's daily activities, growth, and health with ease.
+# slogan: It helps parents track their baby's daily activities, growth, and health with ease.
 # tags: baby, parents, health, growth, activities
 # logo: svgs/babybuddy.png
 

templates/compose/budge.yaml

@@ -1,5 +1,5 @@
 # documentation: https://github.com/linuxserver/budge
-# slogan: Budge is a budgeting personal finance app.
+# slogan: A budgeting personal finance app.
 # tags: personal finance, budgeting, expense tracking
 
 services:

versions.json

@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.261"
+            "version": "4.0.0-beta.263"
         }
     }
 }