From a2ab23529ff5b5324cae24f817b617ccc786fda0 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 2 Sep 2024 10:56:48 +0200
Subject: [PATCH 1/2] chore: Update Coolify version to 4.0.0-beta.325

---
 config/sentry.php  | 2 +-
 config/version.php | 2 +-
 versions.json      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/sentry.php b/config/sentry.php
index 657377edf..53f5848ba 100644
--- 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.324',
+    'release' => '4.0.0-beta.325',
     // 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
index 7af787ece..e82b0fd02 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.324';
+return '4.0.0-beta.325';
diff --git a/versions.json b/versions.json
index 86a124f17..34b209927 100644
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.324"
+            "version": "4.0.0-beta.325"
         },
         "nightly": {
-            "version": "4.0.0-beta.324"
+            "version": "4.0.0-beta.325"
         }
     }
 }

From dfd5cc9cefdbac6d250d07bb6e547af94f2b904f Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 2 Sep 2024 10:57:03 +0200
Subject: [PATCH 2/2] fix: log drain only for Applications

---
 bootstrap/helpers/shared.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index ee1ceb049..e7b42ea2c 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -2819,8 +2819,10 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
             $defaultLabels = defaultLabels($resource->id, $containerName, $pull_request_id, type: 'application');
             $serviceLabels = $serviceLabels->merge($defaultLabels);
 
-            if ($server->isLogDrainEnabled() && $resource->isLogDrainEnabled()) {
-                data_set($service, 'logging', generate_fluentd_configuration());
+            if ($server->isLogDrainEnabled()) {
+                if ($resource instanceof Application && $resource->isLogDrainEnabled()) {
+                    data_set($service, 'logging', generate_fluentd_configuration());
+                }
             }
             if ($serviceLabels->count() > 0) {
                 if ($resource->settings->is_container_label_escape_enabled) {
@@ -2923,8 +2925,10 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
         $restart = data_get_str($service, 'restart', RESTART_MODE);
         $logging = data_get($service, 'logging');
 
-        if ($server->isLogDrainEnabled() && $resource->isLogDrainEnabled()) {
-            $logging = generate_fluentd_configuration();
+        if ($server->isLogDrainEnabled()) {
+            if ($resource instanceof Application && $resource->isLogDrainEnabled()) {
+                $logging = generate_fluentd_configuration();
+            }
         }
         $volumes = collect(data_get($service, 'volumes', []));
         $networks = collect(data_get($service, 'networks', []));