From 5e4eb7dead049f37adf6cafc222d58d60173f6f8 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 29 Aug 2024 15:49:22 +0200 Subject: [PATCH] feat: add coolify build env variables to building phase --- app/Jobs/ApplicationDeploymentJob.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 7819613fb..1ab6e5543 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -113,6 +113,8 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue private $env_args; + private $environment_variables; + private $env_nixpacks_args; private $docker_compose; @@ -1059,6 +1061,7 @@ private function save_environment_variables() ); } } + $this->environment_variables = $envs; } private function laravel_finetunes() @@ -1929,6 +1932,15 @@ private function pull_latest_image($image) private function build_image() { + // Add Coolify related variables to the build args + $this->environment_variables->filter(function ($key, $value) { + return str($key)->startsWith('COOLIFY_'); + })->each(function ($key, $value) { + $this->build_args->push("--build-arg '{$key}'"); + }); + + $this->build_args = $this->build_args->implode(' '); + $this->application_deployment_queue->addLogEntry('----------------------------------------'); if ($this->application->build_pack === 'static') { $this->application_deployment_queue->addLogEntry('Static deployment. Copying static assets to the image.'); @@ -2214,9 +2226,6 @@ private function generate_build_env_variables() $this->build_args->push("--build-arg {$env->key}={$value}"); } } - - $this->build_args = $this->build_args->implode(' '); - ray($this->build_args); } private function add_build_env_variables_to_dockerfile()