From 2d9c583af37679dcc6ecb57d4f1e3a66d0f83fcd Mon Sep 17 00:00:00 2001
From: Vahor <me@vahor.fr>
Date: Tue, 27 Aug 2024 19:36:22 +0200
Subject: [PATCH] add env vars on old compose parser

---
 app/Actions/Server/InstallLogDrain.php |  4 ++--
 bootstrap/helpers/shared.php           | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/Actions/Server/InstallLogDrain.php b/app/Actions/Server/InstallLogDrain.php
index 66b436e2b..d089fe991 100644
--- a/app/Actions/Server/InstallLogDrain.php
+++ b/app/Actions/Server/InstallLogDrain.php
@@ -48,7 +48,7 @@ class InstallLogDrain
 [FILTER]
     Name                modify
     Match               *
-    Set                 server_name {$server->name}
+    Set                 coolify.server_name {$server->name}
     Rename              COOLIFY_APP_NAME coolify.app_name
     Rename              COOLIFY_PROJECT_NAME coolify.project_name
     Rename              COOLIFY_SERVER_IP coolify.server_ip
@@ -105,7 +105,7 @@ class InstallLogDrain
 [FILTER]
     Name                modify
     Match               *
-    Set                 server_name {$server->name}
+    Set                 coolify.server_name {$server->name}
     Rename              COOLIFY_APP_NAME coolify.app_name
     Rename              COOLIFY_PROJECT_NAME coolify.project_name
     Rename              COOLIFY_SERVER_IP coolify.server_ip
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 31ba7989f..83d0c3de3 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -2106,6 +2106,21 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                     }
                 }
                 $parsedServiceVariables->put('COOLIFY_CONTAINER_NAME', "$serviceName-{$resource->uuid}");
+
+                // TODO: move this in a shared function
+                if (! $parsedServiceVariables->has('COOLIFY_APP_NAME')) {
+                    $parsedServiceVariables->put('COOLIFY_APP_NAME', $resource->name);
+                }
+                if (! $parsedServiceVariables->has('COOLIFY_SERVER_IP')) {
+                    $parsedServiceVariables->put("COOLIFY_SERVER_IP", $resource->destination->server->ip);
+                }
+                if (! $parsedServiceVariables->has('COOLIFY_ENVIRONMENT_NAME')) {
+                    $parsedServiceVariables->put("COOLIFY_ENVIRONMENT_NAME", $resource->environment->name);
+                }
+                if (! $parsedServiceVariables->has('COOLIFY_PROJECT_NAME')) {
+                    $parsedServiceVariables->put('COOLIFY_PROJECT_NAME', $resource->project()->name);
+                }
+
                 $parsedServiceVariables = $parsedServiceVariables->map(function ($value, $key) use ($envs_from_coolify) {
                     if (! str($value)->startsWith('$')) {
                         $found_env = $envs_from_coolify->where('key', $key)->first();