Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge pull request #1841 from coollabsio/next

Browse Source 
v4.0.0-beta.238
This commit is contained in:
Andras Bacsai 2024-03-14 19:16:35 +01:00 committed by GitHub
commit bb7b1f9e0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bootstrap/helpers/docker.php
View File

@ -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 { function validateComposeFile(string $compose, int $server_id): string|Throwable {
return 'OK';
try { try {
$uuid = Str::random(10); $uuid = Str::random(10);
$server = Server::findOrFail($server_id); $server = Server::findOrFail($server_id);

6
bootstrap/helpers/shared.php
View File

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

2
config/sentry.php
View File

@ -7,7 +7,7 @@
// The release version of your application // The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) // 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 // When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'), 'environment' => config('app.env'),

2
config/version.php
View File

@ -1,3 +1,3 @@
<?php <?php
return '4.0.0-beta.237'; return '4.0.0-beta.238';

2
versions.json
View File

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