dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #6120 from coollabsio/next

Browse Source 
4.0.0-beta.420.3
This commit is contained in:
Andras Bacsai
2025-07-03 21:30:49 +02:00
committed by GitHub
parent 2ba46bce46 2f68f965a7
commit 1a80a5348b
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bootstrap/helpers/shared.php
View File

@@ -3066,13 +3066,14 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
$fqdn = generateFqdn($server, "$uuid"); $fqdn = generateFqdn($server, "$uuid");
} }
} elseif ($isService) { } elseif ($isService) {
$fqdn = $savedService->fqdn;
if (blank($savedService->fqdn)) { if (blank($savedService->fqdn)) {
if ($fqdnFor) { if ($fqdnFor) {
$fqdn = generateFqdn($server, "$fqdnFor-$uuid"); $fqdn = generateFqdn($server, "$fqdnFor-$uuid");
} else { } else {
$fqdn = generateFqdn($server, "{$savedService->name}-$uuid"); $fqdn = generateFqdn($server, "{$savedService->name}-$uuid");
} }
} else {
$fqdn = str($savedService->fqdn)->after('://')->before(':')->prepend(str($savedService->fqdn)->before('://')->append('://'))->value();
} }
} }

2
config/constants.php
View File

@@ -2,7 +2,7 @@
return [ return [
'coolify' => [ 'coolify' => [
'version' => '4.0.0-beta.420.2', 'version' => '4.0.0-beta.420.3',
'helper_version' => '1.0.8', 'helper_version' => '1.0.8',
'realtime_version' => '1.0.9', 'realtime_version' => '1.0.9',
'self_hosted' => env('SELF_HOSTED', true), 'self_hosted' => env('SELF_HOSTED', true),

4
resources/views/components/popup-small.blade.php
View File

@@ -6,9 +6,9 @@
x-transition:enter-start="translate-y-full" x-transition:enter-end="translate-y-0" x-transition:enter-start="translate-y-full" x-transition:enter-end="translate-y-0"
x-transition:leave="transition ease-in duration-300" x-transition:leave-start="translate-y-0" x-transition:leave="transition ease-in duration-300" x-transition:leave-start="translate-y-0"
x-transition:leave-end="translate-y-full" x-init="setTimeout(() => { bannerVisible = true }, bannerVisibleAfter);" x-transition:leave-end="translate-y-full" x-init="setTimeout(() => { bannerVisible = true }, bannerVisibleAfter);"
class="fixed bottom-0 right-0 h-auto duration-300 ease-out px-5 pb-5 max-w-[46rem] z-999" x-cloak> class="fixed bottom-0 right-0 h-auto duration-300 ease-out px-5 pb-5 max-w-[46rem] z-999" x-cloak>
<div <div
class="flex flex-row items-center justify-between w-full h-full max-w-4xl p-6 mx-auto bg-white border shadow-lg lg:border-t dark:border-coolgray-300 dark:bg-coolgray-100 dark:hover:bg-coolgray-100 lg:p-8 sm:rounded-sm"> class="flex flex-row items-center justify-between w-full h-full max-w-4xl p-6 mx-auto bg-white border shadow-lg lg:border-t dark:border-coolgray-300 dark:bg-coolgray-100 border-neutral-200 dark:hover:bg-coolgray-100 lg:p-8 sm:rounded-sm">
<div <div
class="flex flex-col items-start h-full pb-0 text-xs lg:items-center lg:flex-row lg:pr-6 lg:space-x-5 dark:text-neutral-300 "> class="flex flex-col items-start h-full pb-0 text-xs lg:items-center lg:flex-row lg:pr-6 lg:space-x-5 dark:text-neutral-300 ">
@if (isset($icon)) @if (isset($icon))

4
versions.json
View File

@@ -1,10 +1,10 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.420.2" "version": "4.0.0-beta.420.3"
}, },
"nightly": { "nightly": {
"version": "4.0.0-beta.420.3" "version": "4.0.0-beta.420.4"
}, },
"helper": { "helper": {
"version": "1.0.8" "version": "1.0.8"