From 306d954be2c7c52196614b0cec46107452730b0e Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Wed, 14 Jan 2026 13:33:50 +0100
Subject: [PATCH] buildx(bake): merge existing env vars when parsing definition

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
---
 src/buildx/bake.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/buildx/bake.ts b/src/buildx/bake.ts
index 110a6904..db0dfd05 100644
--- a/src/buildx/bake.ts
+++ b/src/buildx/bake.ts
@@ -105,13 +105,7 @@ export class Bake {
   public async getDefinition(cmdOpts: BakeCmdOpts, execOptions?: ExecOptions): Promise<BakeDefinition> {
     execOptions = execOptions || {ignoreReturnCode: true};
     execOptions.ignoreReturnCode = true;
-    if (cmdOpts.githubToken) {
-      execOptions.env = Object.assign({}, process.env, {
-        BUILDX_BAKE_GIT_AUTH_TOKEN: cmdOpts.githubToken
-      }) as {
-        [key: string]: string;
-      };
-    }
+    execOptions.env = Object.assign({}, process.env, execOptions.env || {}, cmdOpts.githubToken ? {BUILDX_BAKE_GIT_AUTH_TOKEN: cmdOpts.githubToken} : {});
 
     const args = ['bake'];