From 82275b6fed81e40c33fdc90c65c226cf840a2c95 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 23 Jul 2024 14:01:39 -0700
Subject: [PATCH] merge the containerEnv objects

---
 .github/actions/devcontainer-json/action.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/devcontainer-json/action.sh b/.github/actions/devcontainer-json/action.sh
index 7dfa917e..e64f0540 100755
--- a/.github/actions/devcontainer-json/action.sh
+++ b/.github/actions/devcontainer-json/action.sh
@@ -28,7 +28,7 @@ const json = JSON.parse(readFileSync('image/.devcontainer/devcontainer.json'));
 
 json.build.args.BASE = '${os}';
 json.build.args.RAPIDS_VERSION = '${VERSION}';
-json.containerEnv = ${container_env} || undefined;
+json.containerEnv = Object.assign(json.containerEnv || {}, ${container_env} || {});
 
 const dups = {};