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

Merge branch 'next' into patch-1

Browse Source
This commit is contained in:
Dominic
2025-08-31 22:46:35 -04:00
committed by GitHub
parent c0ffda37f2 84e692fb43
commit 719d094754
6 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Api/ApplicationsController.php
View File

@@ -2284,6 +2284,9 @@ class ApplicationsController extends Controller
data_set($data, 'docker_compose_domains', json_encode($dockerComposeDomainsJson)); data_set($data, 'docker_compose_domains', json_encode($dockerComposeDomainsJson));
} }
$application->fill($data); $application->fill($data);
if ($application->settings->is_container_label_readonly_enabled && $requestHasDomains && $server->isProxyShouldRun()) {
$application->custom_labels = str(implode('|coolify|', generateLabelsApplication($application)))->replace('|coolify|', "\n");
}
$application->save(); $application->save();
if ($instantDeploy) { if ($instantDeploy) {

2
config/constants.php
View File

@@ -2,7 +2,7 @@
return [ return [
'coolify' => [ 'coolify' => [
'version' => '4.0.0-beta.426', 'version' => '4.0.0-beta.427',
'helper_version' => '1.0.10', 'helper_version' => '1.0.10',
'realtime_version' => '1.0.10', 'realtime_version' => '1.0.10',
'self_hosted' => env('SELF_HOSTED', true), 'self_hosted' => env('SELF_HOSTED', true),

4
other/nightly/versions.json
View File

@@ -1,10 +1,10 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.426" "version": "4.0.0-beta.427"
}, },
"nightly": { "nightly": {
"version": "4.0.0-beta.427" "version": "4.0.0-beta.428"
}, },
"helper": { "helper": {
"version": "1.0.10" "version": "1.0.10"

2
resources/views/livewire/team/member/index.blade.php
View File

@@ -41,7 +41,7 @@
<h2>Invite New Member</h2> <h2>Invite New Member</h2>
@if (isInstanceAdmin()) @if (isInstanceAdmin())
<div class="pb-4 text-xs dark:text-warning">You need to configure (as root team) <a <div class="pb-4 text-xs dark:text-warning">You need to configure (as root team) <a
href="/settings#smtp" class="underline dark:text-warning">Transactional href="/settings/email" class="underline dark:text-warning">Transactional
Emails</a> Emails</a>
before before
you can invite a you can invite a

2
resources/views/livewire/upgrade.blade.php
View File

@@ -12,7 +12,7 @@
</svg> </svg>
In progress In progress
</button> </button>
<button class="menu-item" @click="modalOpen=true" x-show="!showProgress"> <button class="menu-item cursor-pointer" @click="modalOpen=true" x-show="!showProgress">
<svg xmlns="http://www.w3.org/2000/svg" <svg xmlns="http://www.w3.org/2000/svg"
class="w-6 h-6 text-pink-500 transition-colors hover:text-pink-300" viewBox="0 0 24 24" class="w-6 h-6 text-pink-500 transition-colors hover:text-pink-300" viewBox="0 0 24 24"
stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"

4
versions.json
View File

@@ -1,10 +1,10 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.426" "version": "4.0.0-beta.427"
}, },
"nightly": { "nightly": {
"version": "4.0.0-beta.427" "version": "4.0.0-beta.428"
}, },
"helper": { "helper": {
"version": "1.0.10" "version": "1.0.10"