Merge pull request #1841 from coollabsio/next

v4.0.0-beta.238
coollabsio · Mar 14, 2024 · bb7b1f9 · bb7b1f9
2 parents 2af083b + f994f83
commit bb7b1f9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/bootstrap/helpers/docker.php b/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);

diff --git a/bootstrap/helpers/shared.php b/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";

diff --git a/config/sentry.php b/config/sentry.php
@@ -7,7 +7,7 @@
 
     // 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.238',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

diff --git a/config/version.php b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.237';
+return '4.0.0-beta.238';
diff --git a/versions.json b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.237"
+            "version": "4.0.0-beta.238"
         }
     }
 }