From 38fc1835ac32d71114c45e36ffc4af6909194b64 Mon Sep 17 00:00:00 2001
From: mkorwel <matt.korwel@gmail.com>
Date: Fri, 4 Jul 2025 01:04:42 -0700
Subject: [PATCH] de duplicate docker file.

---
 .gcp/release-docker.yaml | 28 +++++-----------------------
 package.json             |  2 +-
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/.gcp/release-docker.yaml b/.gcp/release-docker.yaml
index 27dd032919..5884ee5287 100644
--- a/.gcp/release-docker.yaml
+++ b/.gcp/release-docker.yaml
@@ -25,7 +25,7 @@ steps:
       - -c
       - |
         IMAGE_TAG="$SHORT_SHA" # Default to SHA
-        if [[ "$TAG_NAME" == *"+nightly"* ]]; then
+        if [[ "$TAG_NAME" == *"-nightly"* ]]; then
           echo "Nightly release detected."
           IMAGE_TAG="${TAG_NAME#v}"
         elif [[ "$TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
@@ -44,17 +44,8 @@ steps:
     args:
       - -c
       - |
-        export GEMINI_SANDBOX_IMAGE_TAG="$SHORT_SHA" # Default to SHA
-        if [[ "$TAG_NAME" == *"-nightly"* ]]; then
-          echo "Nightly release detected."
-          export GEMINI_SANDBOX_IMAGE_TAG="${TAG_NAME#v}"
-        elif [[ "$TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-          echo "Official release detected."
-          export GEMINI_SANDBOX_IMAGE_TAG="${TAG_NAME#v}"
-        else
-          echo "Development/RC release detected. Using commit SHA as tag."
-        fi
-        echo "Using Docker image tag: $GEMINI_SANDBOX_IMAGE_TAG"
+        export GEMINI_SANDBOX_IMAGE_TAG=$(cat /workspace/image_tag.txt)
+        echo "Using Docker image tag for build: $GEMINI_SANDBOX_IMAGE_TAG"
         npm run build:sandbox:fast
     env:
       - 'GEMINI_SANDBOX=$_CONTAINER_TOOL'
@@ -66,17 +57,8 @@ steps:
     args:
       - -c
       - |
-        export GEMINI_SANDBOX_IMAGE_TAG="$SHORT_SHA" # Default to SHA
-        if [[ "$TAG_NAME" == *"-nightly"* ]]; then
-          echo "Nightly release detected."
-          export GEMINI_SANDBOX_IMAGE_TAG="${TAG_NAME#v}"
-        elif [[ "$TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-          echo "Official release detected."
-          export GEMINI_SANDBOX_IMAGE_TAG="${TAG_NAME#v}"
-        else
-          echo "Development/RC release detected. Using commit SHA as tag."
-        fi
-        echo "Using Docker image tag: $GEMINI_SANDBOX_IMAGE_TAG"
+        export GEMINI_SANDBOX_IMAGE_TAG=$(cat /workspace/image_tag.txt)
+        echo "Using Docker image tag for publish: $GEMINI_SANDBOX_IMAGE_TAG"
         npm run publish:sandbox
     env:
       - 'GEMINI_SANDBOX=$_CONTAINER_TOOL'
diff --git a/package.json b/package.json
index 13ff9184c8..128c74a659 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "publish:release": "npm run prepare:package && npm run build:packages && npm run build:sandbox:fast && npm run publish:sandbox && npm run publish:npm",
     "prepublishOnly": "node scripts/check-versions.js && node scripts/prepublish.js",
     "release:version": "node scripts/version.js",
-    "tag:release:nightly": "TAG_NAME=\"v$(node -p \"require('./package.json').version\")-nightly.$(date -u +%Y%m%d).$(git rev-parse --short HEAD)\"; git tag -a $TAG_NAME -m '' && git push origin $TAG_NAME",
+    "tag:release:nightly": "TAG_NAME=\"v$(node -p \"require('./package.json').version\")-nightly.$(date -u +%y%m%d).$(git rev-parse --short HEAD)\"; git tag -a $TAG_NAME -m '' && git push origin $TAG_NAME",
     "check:versions": "node scripts/check-versions.js",
     "publish:actions-release": "npm run prepare:package && npm run build:packages && npm run publish:npm"
   },