From 0f543dc4a81ee6da4302fa58b94da614a4bc6b80 Mon Sep 17 00:00:00 2001
From: mkorwel <matt.korwel@gmail.com>
Date: Tue, 1 Jul 2025 15:20:41 -0500
Subject: [PATCH] proper docker tagging for testing

---
 .gcp/release-docker.yaml | 1 +
 scripts/build_sandbox.js | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gcp/release-docker.yaml b/.gcp/release-docker.yaml
index 9db28dbb4b..c30c402271 100644
--- a/.gcp/release-docker.yaml
+++ b/.gcp/release-docker.yaml
@@ -23,6 +23,7 @@ steps:
     entrypoint: 'npm'
     args: ['run', 'build:sandbox:fast']
     env:
+      - 'GEMINI_SANDBOX_IMAGE_TAG=$SHORT_SHA'
       - 'GEMINI_SANDBOX=$_CONTAINER_TOOL'
 
   # Step 7: Publish sandbox container image
diff --git a/scripts/build_sandbox.js b/scripts/build_sandbox.js
index e2c7a22475..0456a4c222 100644
--- a/scripts/build_sandbox.js
+++ b/scripts/build_sandbox.js
@@ -123,13 +123,16 @@ function buildImage(imageName, dockerfile) {
     readFileSync(join(process.cwd(), 'package.json'), 'utf-8'),
   ).version;
 
+  const imageTag = process.env.GEMINI_SANDBOX_IMAGE_TAG || imageName.split(':')[1];
+  const finalImageName = `${imageName.split(':')[0]}:${imageTag}`;
+
   execSync(
     `${buildCommand} ${
       process.env.BUILD_SANDBOX_FLAGS || ''
-    } --build-arg CLI_VERSION_ARG=${npmPackageVersion} -f "${dockerfile}" -t "${imageName}" .`,
+    } --build-arg CLI_VERSION_ARG=${npmPackageVersion} -f "${dockerfile}" -t "${finalImageName}" .`,
     { stdio: buildStdout, shell: '/bin/bash' },
   );
-  console.log(`built ${imageName}`);
+  console.log(`built ${finalImageName}`);
 }
 
 if (baseImage && baseDockerfile) {