From 117ba360ac0d52c91509cf4955de65d743cf866e Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 5 May 2023 14:48:40 +0200 Subject: [PATCH] nixpacks env variables only during build --- app/Jobs/DeployApplicationJob.php | 2 +- app/Models/Application.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Jobs/DeployApplicationJob.php b/app/Jobs/DeployApplicationJob.php index 9714834a7..e6cfbe37d 100644 --- a/app/Jobs/DeployApplicationJob.php +++ b/app/Jobs/DeployApplicationJob.php @@ -243,7 +243,7 @@ COPY --from={$this->application->uuid}:{$this->git_commit}-build /app/{$this->ap { $environment_variables = collect(); - foreach ($this->application->environment_variables as $env) { + foreach ($this->application->runtime_environment_variables as $env) { $environment_variables->push("$env->key=$env->value"); } // Add PORT if not exists, use the first port as default diff --git a/app/Models/Application.php b/app/Models/Application.php index b782e7616..7481747eb 100644 --- a/app/Models/Application.php +++ b/app/Models/Application.php @@ -78,9 +78,13 @@ class Application extends BaseModel { return $this->hasMany(EnvironmentVariable::class); } + public function runtime_environment_variables(): HasMany + { + return $this->hasMany(EnvironmentVariable::class)->where('key', 'not like', 'NIXPACKS_%'); + } public function build_environment_variables(): HasMany { - return $this->hasMany(EnvironmentVariable::class)->where('is_build_time', true); + return $this->hasMany(EnvironmentVariable::class)->where('is_build_time', true)->where('key', 'not like', 'NIXPACKS_%'); } public function nixpacks_environment_variables(): HasMany {