From c3c032ebbd9460f4be3e63c13c0553a2454497c9 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 22 Jan 2025 15:13:40 +0100
Subject: [PATCH] fix(core): update environment variable generation logic in
 ApplicationDeploymentJob to handle different build packs

---
 app/Jobs/ApplicationDeploymentJob.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 5597eebc9..a6d3bc1a2 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -2288,8 +2288,12 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
 
     private function generate_build_env_variables()
     {
-        $variables = collect($this->nixpacks_plan_json->get('variables'));
-        $variables->put('SOURCE_COMMIT', $this->commit);
+        if ($this->application->build_pack === 'nixpacks') {
+            $variables = collect($this->nixpacks_plan_json->get('variables'));
+        } else {
+            $this->generate_env_variables();
+            $variables = collect([])->merge($this->env_args);
+        }
 
         $this->build_args = $variables->map(function ($value, $key) {
             $value = escapeshellarg($value);