Merge pull request #1658 from coollabsio/next

v4.0.0-beta.196

app/Jobs/ApplicationDeploymentJob.php

@@ -477,7 +477,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             );
         } else {
             $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
             );
         }
 
@@ -521,7 +521,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             );
         } else {
             $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up -d"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up -d"), "hidden" => true],
             );
         }
         $this->application_deployment_queue->addLogEntry("New container started.");
@@ -756,7 +756,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         } else {
             $this->execute_remote_command(
                 ["echo -n 'Starting preview deployment.'"],
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} up -d"), "hidden" => true],
             );
         }
     }
@@ -917,6 +917,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $merged_envs = $this->env_args->merge(collect(data_get($parsed, 'variables', [])));
                 data_set($parsed, 'variables', $merged_envs->toArray());
                 $this->nixpacks_plan = json_encode($parsed, JSON_PRETTY_PRINT);
+                ray($this->nixpacks_plan);
             }
         }
     }
@@ -964,6 +965,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->env_args->put($env->key, $env->value);
             }
         }
+        $this->env_args->put('SOURCE_COMMIT', $this->commit);
     }
 
     private function generate_compose_file()
@@ -1190,12 +1192,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             }
         }
         // Add PORT if not exists, use the first port as default
-        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('PORT'))->isEmpty()) {
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->startsWith('PORT'))->isEmpty()) {
             $environment_variables->push("PORT={$ports[0]}");
         }
-        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('SOURCE_COMMIT'))->isEmpty()) {
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->startsWith('SOURCE_COMMIT'))->isEmpty()) {
             if (!is_null($this->commit)) {
                 $environment_variables->push("SOURCE_COMMIT={$this->commit}");
+            } else {
+                $environment_variables->push("SOURCE_COMMIT=unknown");
             }
         }
         return $environment_variables->all();
@@ -1440,11 +1444,11 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             $this->application_deployment_queue->addLogEntry("Pulling latest images from the registry.");
             $this->execute_remote_command(
                 [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} pull"), "hidden" => true],
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} build"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} build"), "hidden" => true],
             );
         } else {
             $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
             );
         }
         $this->application_deployment_queue->addLogEntry("New images built.");
@@ -1456,16 +1460,16 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             $this->application_deployment_queue->addLogEntry("Pulling latest images from the registry.");
             $this->execute_remote_command(
                 [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} pull"), "hidden" => true],
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
             );
         } else {
             if ($this->docker_compose_location) {
                 $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up --build -d"), "hidden" => true],
+                    [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up --build -d"), "hidden" => true],
                 );
             } else {
                 $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
+                    [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
                 );
             }
         }

app/Livewire/Project/Application/General.php

@@ -117,7 +117,7 @@ class General extends Component
         $this->isConfigurationChanged = $this->application->isConfigurationChanged();
         $this->customLabels = $this->application->parseContainerLabels();
         if (!$this->customLabels && $this->application->destination->server->proxyType() === 'TRAEFIK_V2') {
-            $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+            $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
             $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();
         }
@@ -182,7 +182,7 @@ class General extends Component
     }
     public function checkLabelUpdates()
     {
-        if (md5($this->application->custom_labels) !== md5(implode(",", generateLabelsApplication($this->application)))) {
+        if (md5($this->application->custom_labels) !== md5(implode("|", generateLabelsApplication($this->application)))) {
             $this->labelsChanged = true;
         } else {
             $this->labelsChanged = false;
@@ -201,7 +201,7 @@ class General extends Component
     }
     public function resetDefaultLabels($showToaster = true)
     {
-        $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+        $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
         $this->ports_exposes = $this->application->ports_exposes;
         $this->submit($showToaster);
     }
@@ -215,7 +215,7 @@ class General extends Component
     {
         try {
             if (!$this->customLabels && $this->application->destination->server->proxyType() === 'TRAEFIK_V2') {
-                $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+                $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
                 $this->application->custom_labels = base64_encode($this->customLabels);
                 $this->application->save();
             }

app/Models/Application.php

@@ -1066,7 +1066,7 @@ class Application extends BaseModel
         $customLabels = base64_decode($this->custom_labels);
         if (mb_detect_encoding($customLabels, 'ASCII', true) === false) {
             ray('custom_labels contains non-ascii characters');
-            $customLabels = str(implode(",", generateLabelsApplication($this, $preview)))->replace(',', "\n");
+            $customLabels = str(implode("|", generateLabelsApplication($this, $preview)))->replace("|", "\n");
         }
         $this->custom_labels = base64_encode($customLabels);
         $this->save();

bootstrap/helpers/docker.php

@@ -215,6 +215,8 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
 {
     $labels = collect([]);
     $labels->push('traefik.enable=true');
+    $labels->push("traefik.http.middlewares.gzip.compress=true");
+    $labels->push("traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https");
     foreach ($domains as $loop => $domain) {
         try {
             $uuid = new Cuid2(7);
@@ -229,8 +231,6 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
             $http_label = "http-{$loop}-{$uuid}";
             $https_label = "https-{$loop}-{$uuid}";
 
-            $labels->push("traefik.http.middlewares.gzip.compress=true");
-            $labels->push("traefik.http.routers.{$https_label}.middlewares=gzip");
             if ($schema === 'https') {
                 // Set labels for https
                 $labels->push("traefik.http.routers.{$https_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)");
@@ -240,8 +240,10 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     $labels->push("traefik.http.services.{$https_label}.loadbalancer.server.port=$port");
                 }
                 if ($path !== '/') {
-                    $labels->push("traefik.http.routers.{$https_label}.middlewares={$https_label}-stripprefix");
                     $labels->push("traefik.http.middlewares.{$https_label}-stripprefix.stripprefix.prefixes={$path}");
+                    $labels->push("traefik.http.routers.{$https_label}.middlewares={$https_label}-stripprefix,gzip");
+                } else {
+                    $labels->push("traefik.http.routers.{$https_label}.middlewares=gzip");
                 }
 
                 $labels->push("traefik.http.routers.{$https_label}.tls=true");
@@ -255,7 +257,6 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     $labels->push("traefik.http.routers.{$http_label}.service={$http_label}");
                 }
                 if ($is_force_https_enabled) {
-                    $labels->push("traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https");
                     $labels->push("traefik.http.routers.{$http_label}.middlewares=redirect-to-https");
                 }
             } else {
@@ -267,8 +268,10 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     $labels->push("traefik.http.routers.{$http_label}.service={$http_label}");
                 }
                 if ($path !== '/') {
-                    $labels->push("traefik.http.routers.{$http_label}.middlewares={$http_label}-stripprefix");
                     $labels->push("traefik.http.middlewares.{$http_label}-stripprefix.stripprefix.prefixes={$path}");
+                    $labels->push("traefik.http.routers.{$http_label}.middlewares={$http_label}-stripprefix,gzip");
+                } else {
+                    $labels->push("traefik.http.routers.{$http_label}.middlewares=gzip");
                 }
             }
         } catch (\Throwable $e) {

bootstrap/helpers/remoteProcess.php

@@ -126,7 +126,7 @@ function generateSshCommand(Server $server, string $command, bool $isMux = true)
     if (data_get($server, 'settings.is_cloudflare_tunnel')) {
         $ssh_command .= '-o ProxyCommand="/usr/local/bin/cloudflared access ssh --hostname %h" ';
     }
-    $command = "test -f ~/.profile && . ~/.profile; PATH=\$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/local/sbin:/host/usr/local/bin:/host/usr/sbin:/host/usr/bin:/host/sbin:/host/bin && $command";
+    $command = "PATH=\$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/local/sbin:/host/usr/local/bin:/host/usr/sbin:/host/usr/bin:/host/sbin:/host/bin && $command";
     $ssh_command .= "-i {$privateKeyLocation} "
         . '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null '
         . '-o PasswordAuthentication=no '

bootstrap/helpers/shared.php

@@ -1593,6 +1593,9 @@ function getRealtime()
 
 function validate_dns_entry(string $fqdn, Server $server)
 {
+    # https://www.cloudflare.com/ips-v4/#
+    $cloudflare_ips = collect(['173.245.48.0/20', '103.21.244.0/22', '103.22.200.0/22', '103.31.4.0/22', '141.101.64.0/18', '108.162.192.0/18', '190.93.240.0/20', '188.114.96.0/20', '197.234.240.0/22', '198.41.128.0/17', '162.158.0.0/15', '104.16.0.0/13', '172.64.0.0/13', '131.0.72.0/22']);
+
     $url = Url::fromString($fqdn);
     $host = $url->getHost();
     if (str($host)->contains('sslip.io')) {
@@ -1603,29 +1606,34 @@ function validate_dns_entry(string $fqdn, Server $server)
     if (!$is_dns_validation_enabled) {
         return true;
     }
-    $dnsServers = data_get($settings, 'custom_dns_servers');
-    $dnsServers = str($dnsServers)->explode(',');
+    $dns_servers = data_get($settings, 'custom_dns_servers');
+    $dns_servers = str($dns_servers)->explode(',');
     if ($server->id === 0) {
         $ip = data_get($settings, 'public_ipv4') || data_get($settings, 'public_ipv6') || $server->ip;
     } else {
         $ip = $server->ip;
     }
-    $foundMatch = false;
+    $found_matching_ip = false;
     $type = \PurplePixie\PhpDns\DNSTypes::NAME_A;
-    foreach ($dnsServers as $dnsServer) {
+    foreach ($dns_servers as $dns_server) {
         try {
-            ray("Checking $host on $dnsServer");
-            $query = new DNSQuery($dnsServer);
+            ray("Checking $host on $dns_server");
+            $query = new DNSQuery($dns_server);
             $results = $query->query($host, $type);
             if ($results === false || $query->hasError()) {
                 ray("Error: " . $query->getLasterror());
             } else {
                 foreach ($results as $result) {
                     if ($result->getType() == $type) {
+                        if (ip_match($result->getData(), $cloudflare_ips->toArray(), $match)) {
+                            ray("Found match in Cloudflare IPs: $match");
+                            $found_matching_ip = true;
+                            break;
+                        }
                         if ($result->getData() === $ip) {
                             ray($host . " has IP address " . $result->getData());
                             ray($result->getString());
-                            $foundMatch = true;
+                            $found_matching_ip = true;
                             break;
                         }
                     }
@@ -1634,6 +1642,18 @@ function validate_dns_entry(string $fqdn, Server $server)
         } catch (\Exception $e) {
         }
     }
-    ray("Found match: $foundMatch");
-    return $foundMatch;
+    ray("Found match: $found_matching_ip");
+    return $found_matching_ip;
+}
+
+function ip_match($ip, $cidrs, &$match = null)
+{
+    foreach ((array) $cidrs as $cidr) {
+        list($subnet, $mask) = explode('/', $cidr);
+        if (((ip2long($ip) & ($mask = ~((1 << (32 - $mask)) - 1))) == (ip2long($subnet) & $mask))) {
+            $match = $cidr;
+            return true;
+        }
+    }
+    return false;
 }

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

package-lock.json

@@ -5,7 +5,6 @@
     "packages": {
         "": {
             "dependencies": {
-                "@alpinejs/focus": "^3.13.3",
                 "@tailwindcss/typography": "0.5.10",
                 "alpinejs": "3.13.3",
                 "daisyui": "4.4.19",
@@ -15,14 +14,14 @@
             "devDependencies": {
                 "@vitejs/plugin-vue": "4.5.1",
                 "autoprefixer": "10.4.16",
-                "axios": "1.6.2",
+                "axios": "1.6.5",
                 "laravel-echo": "1.15.3",
                 "laravel-vite-plugin": "0.8.1",
-                "postcss": "8.4.32",
+                "postcss": "8.4.33",
                 "pusher-js": "8.4.0-rc2",
-                "tailwindcss": "3.3.6",
+                "tailwindcss": "3.4.1",
                 "vite": "4.5.1",
-                "vue": "3.3.10"
+                "vue": "3.4.13"
             }
         },
         "node_modules/@alloc/quick-lru": {
@@ -36,19 +35,10 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/@alpinejs/focus": {
-            "version": "3.13.3",
-            "resolved": "https://registry.npmjs.org/@alpinejs/focus/-/focus-3.13.3.tgz",
-            "integrity": "sha512-fTRX/9wOfysyZ1PJ4gHeUnmiNTIgqBDIqKxeP5iMvj1UHD3TFLDXllvoIKH3ezqcsyQZqxd/q1MFM7dlIhkmeg==",
-            "dependencies": {
-                "focus-trap": "^6.9.4",
-                "tabbable": "^5.3.3"
-            }
-        },
         "node_modules/@babel/parser": {
-            "version": "7.23.5",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz",
-            "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==",
+            "version": "7.23.6",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
+            "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
             "dev": true,
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -534,51 +524,51 @@
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.10.tgz",
-            "integrity": "sha512-doe0hODR1+i1menPkRzJ5MNR6G+9uiZHIknK3Zn5OcIztu6GGw7u0XUzf3AgB8h/dfsZC9eouzoLo3c3+N/cVA==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.13.tgz",
+            "integrity": "sha512-zGUdmB3j3Irn9z51GXLJ5s0EAHxmsm5/eXl0y6MBaajMeOAaiT4+zaDoxui4Ets98dwIRr8BBaqXXHtHSfm+KA==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.23.5",
-                "@vue/shared": "3.3.10",
+                "@babel/parser": "^7.23.6",
+                "@vue/shared": "3.4.13",
+                "entities": "^4.5.0",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.0.2"
             }
         },
         "node_modules/@vue/compiler-core/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.10.tgz",
-            "integrity": "sha512-NCrqF5fm10GXZIK0GrEAauBqdy+F2LZRt3yNHzrYjpYBuRssQbuPLtSnSNjyR9luHKkWSH8we5LMB3g+4z2HvA==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.13.tgz",
+            "integrity": "sha512-XSNbpr5Rs3kCfVAmBqMu/HDwOS+RL6y28ZZjDlnDUuf146pRWt2sQkwhsOYc9uu2lxjjJy2NcyOkK7MBLVEc7w==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-core": "3.3.10",
-                "@vue/shared": "3.3.10"
+                "@vue/compiler-core": "3.4.13",
+                "@vue/shared": "3.4.13"
             }
         },
         "node_modules/@vue/compiler-dom/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.10.tgz",
-            "integrity": "sha512-xpcTe7Rw7QefOTRFFTlcfzozccvjM40dT45JtrE3onGm/jBLZ0JhpKu3jkV7rbDFLeeagR/5RlJ2Y9SvyS0lAg==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.13.tgz",
+            "integrity": "sha512-SkpmQN8xIFBd5onT413DFSDdjxULJf6jmJg/t3w/DZ9I8ZzyNlLIBLO0qFLewVHyHCiAgpPZlWqSRZXYrawk3Q==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.23.5",
-                "@vue/compiler-core": "3.3.10",
-                "@vue/compiler-dom": "3.3.10",
-                "@vue/compiler-ssr": "3.3.10",
-                "@vue/reactivity-transform": "3.3.10",
-                "@vue/shared": "3.3.10",
+                "@babel/parser": "^7.23.6",
+                "@vue/compiler-core": "3.4.13",
+                "@vue/compiler-dom": "3.4.13",
+                "@vue/compiler-ssr": "3.4.13",
+                "@vue/shared": "3.4.13",
                 "estree-walker": "^2.0.2",
                 "magic-string": "^0.30.5",
                 "postcss": "^8.4.32",
@@ -586,25 +576,25 @@
             }
         },
         "node_modules/@vue/compiler-sfc/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.10.tgz",
-            "integrity": "sha512-12iM4jA4GEbskwXMmPcskK5wImc2ohKm408+o9iox3tfN9qua8xL0THIZtoe9OJHnXP4eOWZpgCAAThEveNlqQ==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.13.tgz",
+            "integrity": "sha512-rwnw9SVBgD6eGKh8UucnwztieQo/R3RQrEGpE0b0cxb2xxvJeLs/fe7DoYlhEfaSyzM/qD5odkK87hl3G3oW+A==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.3.10",
-                "@vue/shared": "3.3.10"
+                "@vue/compiler-dom": "3.4.13",
+                "@vue/shared": "3.4.13"
             }
         },
         "node_modules/@vue/compiler-ssr/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/@vue/reactivity": {
@@ -615,84 +605,65 @@
                 "@vue/shared": "3.1.5"
             }
         },
-        "node_modules/@vue/reactivity-transform": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.10.tgz",
-            "integrity": "sha512-0xBdk+CKHWT+Gev8oZ63Tc0qFfj935YZx+UAynlutnrDZ4diFCVFMWixn65HzjE3S1iJppWOo6Tt1OzASH7VEg==",
-            "dev": true,
-            "dependencies": {
-                "@babel/parser": "^7.23.5",
-                "@vue/compiler-core": "3.3.10",
-                "@vue/shared": "3.3.10",
-                "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.5"
-            }
-        },
-        "node_modules/@vue/reactivity-transform/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
-            "dev": true
-        },
         "node_modules/@vue/runtime-core": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.10.tgz",
-            "integrity": "sha512-DZ0v31oTN4YHX9JEU5VW1LoIVgFovWgIVb30bWn9DG9a7oA415idcwsRNNajqTx8HQJyOaWfRKoyuP2P2TYIag==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.13.tgz",
+            "integrity": "sha512-Ov4d4At7z3goxqzSqQxdfVYEcN5HY4dM1uDYL6Hu/Es9Za9BEN602zyjWhhi2+BEki5F9NizRSvn02k/tqNWlg==",
             "dev": true,
             "dependencies": {
-                "@vue/reactivity": "3.3.10",
-                "@vue/shared": "3.3.10"
+                "@vue/reactivity": "3.4.13",
+                "@vue/shared": "3.4.13"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/reactivity": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.10.tgz",
-            "integrity": "sha512-H5Z7rOY/JLO+e5a6/FEXaQ1TMuOvY4LDVgT+/+HKubEAgs9qeeZ+NhADSeEtrNQeiKLDuzeKc8v0CUFpB6Pqgw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.13.tgz",
+            "integrity": "sha512-/ZdUOrGKkGVONzVJkfDqNcn2fLMvaa5VlYx2KwTbnRbX06YZ4GJE0PVTmWzIxtBYdpSTLLXgw3pDggO+96KXzg==",
             "dev": true,
             "dependencies": {
-                "@vue/shared": "3.3.10"
+                "@vue/shared": "3.4.13"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/@vue/runtime-dom": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.10.tgz",
-            "integrity": "sha512-c/jKb3ny05KJcYk0j1m7Wbhrxq7mZYr06GhKykDMNRRR9S+/dGT8KpHuNQjv3/8U4JshfkAk6TpecPD3B21Ijw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.13.tgz",
+            "integrity": "sha512-ynde9p16eEV3u1VCxUre2e0nKzD0l3NzH0r599+bXeLT1Yhac8Atcot3iL9XNqwolxYCI89KBII+2MSVzfrz6w==",
             "dev": true,
             "dependencies": {
-                "@vue/runtime-core": "3.3.10",
-                "@vue/shared": "3.3.10",
-                "csstype": "^3.1.2"
+                "@vue/runtime-core": "3.4.13",
+                "@vue/shared": "3.4.13",
+                "csstype": "^3.1.3"
             }
         },
         "node_modules/@vue/runtime-dom/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/@vue/server-renderer": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.10.tgz",
-            "integrity": "sha512-0i6ww3sBV3SKlF3YTjSVqKQ74xialMbjVYGy7cOTi7Imd8ediE7t72SK3qnvhrTAhOvlQhq6Bk6nFPdXxe0sAg==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.13.tgz",
+            "integrity": "sha512-hkw+UQyDZZtSn1q30nObMfc8beVEQv2pG08nghigxGw+iOWodR+tWSuJak0mzWAHlP/xt/qLc//dG6igfgvGEA==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-ssr": "3.3.10",
-                "@vue/shared": "3.3.10"
+                "@vue/compiler-ssr": "3.4.13",
+                "@vue/shared": "3.4.13"
             },
             "peerDependencies": {
-                "vue": "3.3.10"
+                "vue": "3.4.13"
             }
         },
         "node_modules/@vue/server-renderer/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/@vue/shared": {
@@ -774,12 +745,12 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.6.2",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-            "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
+            "version": "1.6.5",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
+            "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
             "dev": true,
             "dependencies": {
-                "follow-redirects": "^1.15.0",
+                "follow-redirects": "^1.15.4",
                 "form-data": "^4.0.0",
                 "proxy-from-env": "^1.1.0"
             }
@@ -968,9 +939,9 @@
             }
         },
         "node_modules/csstype": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-            "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==",
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
             "dev": true
         },
         "node_modules/culori": {
@@ -1048,6 +1019,18 @@
             "integrity": "sha512-UdREXMXzLkREF4jA8t89FQjA8WHI6ssP38PMY4/4KhXFQbtImnghh4GkCgrtiZwLKUKVD2iTVXvDVQjfomEQuA==",
             "dev": true
         },
+        "node_modules/entities": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+            "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.12"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/entities?sponsor=1"
+            }
+        },
         "node_modules/esbuild": {
             "version": "0.18.20",
             "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
@@ -1150,18 +1133,10 @@
                 "node": ">=8"
             }
         },
-        "node_modules/focus-trap": {
-            "version": "6.9.4",
-            "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.4.tgz",
-            "integrity": "sha512-v2NTsZe2FF59Y+sDykKY+XjqZ0cPfhq/hikWVL88BqLivnNiEffAsac6rP6H45ff9wG9LL5ToiDqrLEP9GX9mw==",
-            "dependencies": {
-                "tabbable": "^5.3.3"
-            }
-        },
         "node_modules/follow-redirects": {
-            "version": "1.15.2",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-            "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+            "version": "1.15.5",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
+            "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
             "dev": true,
             "funding": [
                 {
@@ -1623,9 +1598,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.32",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
-            "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
+            "version": "8.4.33",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
+            "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -1945,15 +1920,10 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/tabbable": {
-            "version": "5.3.3",
-            "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz",
-            "integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA=="
-        },
         "node_modules/tailwindcss": {
-            "version": "3.3.6",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.6.tgz",
-            "integrity": "sha512-AKjF7qbbLvLaPieoKeTjG1+FyNZT6KaJMJPFeQyLfIp7l82ggH1fbHJSsYIvnbTFQOlkh+gBYpyby5GT1LIdLw==",
+            "version": "3.4.1",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz",
+            "integrity": "sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==",
             "dependencies": {
                 "@alloc/quick-lru": "^5.2.0",
                 "arg": "^5.0.2",
@@ -2136,16 +2106,16 @@
             }
         },
         "node_modules/vue": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.10.tgz",
-            "integrity": "sha512-zg6SIXZdTBwiqCw/1p+m04VyHjLfwtjwz8N57sPaBhEex31ND0RYECVOC1YrRwMRmxFf5T1dabl6SGUbMKKuVw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.13.tgz",
+            "integrity": "sha512-FE3UZ0p+oUZTwz+SzlH/hDFg+XsVRFvwmx0LXjdD1pRK/cO4fu5v6ltAZji4za4IBih3dV78elUK3di8v3pWIg==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.3.10",
-                "@vue/compiler-sfc": "3.3.10",
-                "@vue/runtime-dom": "3.3.10",
-                "@vue/server-renderer": "3.3.10",
-                "@vue/shared": "3.3.10"
+                "@vue/compiler-dom": "3.4.13",
+                "@vue/compiler-sfc": "3.4.13",
+                "@vue/runtime-dom": "3.4.13",
+                "@vue/server-renderer": "3.4.13",
+                "@vue/shared": "3.4.13"
             },
             "peerDependencies": {
                 "typescript": "*"
@@ -2157,9 +2127,9 @@
             }
         },
         "node_modules/vue/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/wrappy": {

package.json

@@ -8,17 +8,16 @@
     "devDependencies": {
         "@vitejs/plugin-vue": "4.5.1",
         "autoprefixer": "10.4.16",
-        "axios": "1.6.2",
+        "axios": "1.6.5",
         "laravel-echo": "1.15.3",
         "laravel-vite-plugin": "0.8.1",
-        "postcss": "8.4.32",
+        "postcss": "8.4.33",
         "pusher-js": "8.4.0-rc2",
-        "tailwindcss": "3.3.6",
+        "tailwindcss": "3.4.1",
         "vite": "4.5.1",
-        "vue": "3.3.10"
+        "vue": "3.4.13"
     },
     "dependencies": {
-        "@alpinejs/focus": "^3.13.3",
         "@tailwindcss/typography": "0.5.10",
         "alpinejs": "3.13.3",
         "daisyui": "4.4.19",

resources/views/livewire/server/form.blade.php

@@ -52,7 +52,7 @@
             <div class="w-64">
                 @if (!$server->isLocalhost())
                     <x-forms.checkbox instantSave
-                        helper="If you are using Cloudflare Tunnels, enable this. It will proxy all ssh requests to your server through Cloudflare.<span class='text-warning'>Coolify does not install/setup Cloudflare (cloudflared) on your server.</span>"
+                        helper="If you are using Cloudflare Tunnels, enable this. It will proxy all ssh requests to your server through Cloudflare.<br><span class='text-warning'>Coolify does not install/setup Cloudflare (cloudflared) on your server.</span>"
                         id="server.settings.is_cloudflare_tunnel" label="Cloudflare Tunnel" />
                     @if ($server->isSwarm())
                         <div class="pt-6"> Swarm support is in alpha version. </div>

routes/webhooks.php

@@ -163,7 +163,7 @@ Route::post('/source/gitlab/events/manual', function () {
                 }
             }
             if ($x_gitlab_event === 'merge_request') {
-                if ($action === 'opened' || $action === 'synchronize' || $action === 'reopened' || $action === 'reopen' || $action === 'update') {
+                if ($action === 'open' || $action === 'opened' || $action === 'synchronize' || $action === 'reopened' || $action === 'reopen' || $action === 'update') {
                     if ($application->isPRDeployable()) {
                         $deployment_uuid = new Cuid2(7);
                         $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
@@ -197,7 +197,7 @@ Route::post('/source/gitlab/events/manual', function () {
                         ]);
                         ray('Preview deployments disabled for ' . $application->name);
                     }
-                } else if ($action === 'closed') {
+                } else if ($action === 'closed' || $action === 'close') {
                     $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
                     if ($found) {
                         $found->delete();

versions.json

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