Merge pull request #1843 from coollabsio/next

v4.0.0-beta.239

app/Jobs/ApplicationDeploymentJob.php

@@ -1128,9 +1128,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->custom_healthcheck_found = false;
         if ($this->application->build_pack === 'dockerfile' || $this->application->dockerfile) {
             $this->execute_remote_command([
-                executeInDocker($this->deployment_uuid, "cat {$this->workdir}{$this->dockerfile_location}"), "hidden" => true, "save" => 'dockerfile', "ignore_errors" => true
+                executeInDocker($this->deployment_uuid, "cat {$this->workdir}{$this->dockerfile_location}"), "hidden" => true, "save" => 'dockerfile_from_repo', "ignore_errors" => true
             ]);
-            $dockerfile = collect(Str::of($this->saved_outputs->get('dockerfile'))->trim()->explode("\n"));
+            $dockerfile = collect(Str::of($this->saved_outputs->get('dockerfile_from_repo'))->trim()->explode("\n"));
             if (str($dockerfile)->contains('HEALTHCHECK')) {
                 $this->custom_healthcheck_found = true;
             }

bootstrap/helpers/docker.php

@@ -558,6 +558,7 @@ function convert_docker_run_to_compose(?string $custom_docker_run_options = null
 }
 
 function validateComposeFile(string $compose, int $server_id): string|Throwable {
+    return 'OK';
     try {
         $uuid = Str::random(10);
         $server = Server::findOrFail($server_id);

bootstrap/helpers/shared.php

@@ -914,8 +914,14 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                 // SERVICE_FQDN_UMAMI_1000
                                 $port = $key->afterLast('_');
                             } else {
-                                // SERVICE_FQDN_UMAMI
-                                $port = null;
+                                $last = $key->afterLast('_');
+                                if (is_numeric($last->value())) {
+                                    // SERVICE_FQDN_3001
+                                    $port = $last;
+                                } else {
+                                    // SERVICE_FQDN_UMAMI
+                                    $port = null;
+                                }
                             }
                             if ($port) {
                                 $fqdn = "$fqdn:$port";

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

versions.json

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