From 2e3d7ad23b70d84fa27b4e4e338dfc2cbafe7831 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 15 Apr 2025 18:29:49 +0200
Subject: [PATCH 1/5] chore(versions): bump coolify version to 4.0.0-beta.409
in configuration files
---
config/constants.php | 2 +-
other/nightly/versions.json | 2 +-
versions.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/constants.php b/config/constants.php
index 3287f61e4..e7c7b68b9 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -2,7 +2,7 @@
return [
'coolify' => [
- 'version' => '4.0.0-beta.408',
+ 'version' => '4.0.0-beta.409',
'helper_version' => '1.0.8',
'realtime_version' => '1.0.7',
'self_hosted' => env('SELF_HOSTED', true),
diff --git a/other/nightly/versions.json b/other/nightly/versions.json
index 8d7639e3f..e940b635b 100644
--- a/other/nightly/versions.json
+++ b/other/nightly/versions.json
@@ -1,7 +1,7 @@
{
"coolify": {
"v4": {
- "version": "4.0.0-beta.408"
+ "version": "4.0.0-beta.409"
},
"nightly": {
"version": "4.0.0-beta.410"
diff --git a/versions.json b/versions.json
index 8d7639e3f..e940b635b 100644
--- a/versions.json
+++ b/versions.json
@@ -1,7 +1,7 @@
{
"coolify": {
"v4": {
- "version": "4.0.0-beta.408"
+ "version": "4.0.0-beta.409"
},
"nightly": {
"version": "4.0.0-beta.410"
From 3894023a2efa7e03fbe60200111c60c5af6375ce Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 15 Apr 2025 18:41:21 +0200
Subject: [PATCH 2/5] fix(parser): transform associative array labels into
key=value format for better compatibility
---
bootstrap/helpers/shared.php | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 117e5c9dc..72b92e95a 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -3206,6 +3206,15 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
$use_network_mode = data_get($service, 'network_mode') !== null;
$depends_on = collect(data_get($service, 'depends_on', []));
$labels = collect(data_get($service, 'labels', []));
+ if ($labels->count() > 0) {
+ if (isAssociativeArray($labels)) {
+ $newLabels = collect([]);
+ $labels->each(function ($value, $key) use ($newLabels) {
+ $newLabels->push("$key=$value");
+ });
+ $labels = $newLabels;
+ }
+ }
$environment = collect(data_get($service, 'environment', []));
$ports = collect(data_get($service, 'ports', []));
$buildArgs = collect(data_get($service, 'build.args', []));
@@ -3819,6 +3828,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
return $volume;
});
+ ray($serviceLabels);
$payload = collect($service)->merge([
'container_name' => $containerName,
'restart' => $restart->value(),
From 34b75927f2136ca686d0c710518c5734f0a07b6d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 15 Apr 2025 18:58:00 +0200
Subject: [PATCH 3/5] fix(redis): update username and password input handling
to clarify database sync requirements
---
.../project/database/redis/general.blade.php | 35 ++++++++++++++-----
1 file changed, 27 insertions(+), 8 deletions(-)
diff --git a/resources/views/livewire/project/database/redis/general.blade.php b/resources/views/livewire/project/database/redis/general.blade.php
index 20acf52c0..577c0d3e9 100644
--- a/resources/views/livewire/project/database/redis/general.blade.php
+++ b/resources/views/livewire/project/database/redis/general.blade.php
@@ -13,22 +13,41 @@
helper="For all available images, check here:
https://hub.docker.com/_/redis" />
- @if (version_compare($redis_version, '6.0', '>='))
- If you change the values in the database, please sync it here,
+ otherwise
+ automations won't work.
Changing them here will not change the values in the database.
+
+
+ @if (version_compare($redis_version, '6.0', '>='))
+
+ @endif
+
+
+ @else
+ You can only change the username and password in the database after
+ initial start.
+
+ @if (version_compare($redis_version, '6.0', '>='))
+
- @endif
- isSharedVariable('REDIS_USERNAME')" />
+ @endif
+
+ :disabled="$this->isSharedVariable('REDIS_PASSWORD')" />
+
+ @endif
Date: Wed, 16 Apr 2025 10:04:03 +0200
Subject: [PATCH 4/5] refactor(source): conditionally display connected source
and change source options based on private key presence
---
.../project/application/source.blade.php | 72 ++++++++++---------
1 file changed, 37 insertions(+), 35 deletions(-)
diff --git a/resources/views/livewire/project/application/source.blade.php b/resources/views/livewire/project/application/source.blade.php
index 29c5c6142..ee217649a 100644
--- a/resources/views/livewire/project/application/source.blade.php
+++ b/resources/views/livewire/project/application/source.blade.php
@@ -26,9 +26,11 @@
Code source of your application.
-
Currently connected source: {{ $application->source->name }}
-
+ @if (!$privateKeyId)
+
Currently connected source: {{ $application->source->name }}
+
+ @endif
@@ -38,38 +40,6 @@
-
Change Git Source
-
- @forelse ($sources as $source)
-
-
-
-
-
- {{ $source->name }}
- @if ($application->source_id === $source->id)
- (current)
- @endif
-
-
- {{ $source->organization ?? 'Personal Account' }}
-
-
-
- @empty
-
No sources found
- @endforelse
-
-
Deploy Key
Currently attached Private Key:
@endforeach
+ @else
+
+
Change Git Source
+
+ @forelse ($sources as $source)
+
+
+
+
+
+ {{ $source->name }}
+ @if ($application->source_id === $source->id)
+ (current)
+ @endif
+
+
+ {{ $source->organization ?? 'Personal Account' }}
+
+
+
+ @empty
+
No sources found
+ @endforelse
+
+
@if (!$privateKeyId)
Currently connected source: {{ $application->source->name }}
+ class="font-bold text-warning">{{ data_get($application, 'source.name', 'No source connected') }}
@endif