From b018e2d3ad1035d892fe769128e3bf8b3045eddb Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Sat, 12 Jul 2025 23:46:49 -0700 Subject: [PATCH] Fix docker release yaml to use correct commands. (#4025) --- .gcp/release-docker.yaml | 14 +++++++------- package.json | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gcp/release-docker.yaml b/.gcp/release-docker.yaml index 98042052..1a8ad6b5 100644 --- a/.gcp/release-docker.yaml +++ b/.gcp/release-docker.yaml @@ -46,7 +46,7 @@ steps: - | 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 + npm run build:sandbox env: - 'GEMINI_SANDBOX=$_CONTAINER_TOOL' @@ -58,13 +58,13 @@ steps: - -c - | set -e - IMAGE_TAG=$(cat /workspace/image_tag.txt) - BASE_IMAGE_URI=$(npm run -s config get sandboxImageUri) - IMAGE_URI_NO_TAG=${BASE_IMAGE_URI%:*} - FINAL_IMAGE_URI="${IMAGE_URI_NO_TAG}:${IMAGE_TAG}" + IMAGE_TAG=$$(cat /workspace/image_tag.txt) + BASE_IMAGE_URI=$$(npm run -s config get sandboxImageUri) + IMAGE_URI_NO_TAG=$${BASE_IMAGE_URI%:*} + FINAL_IMAGE_URI="$${IMAGE_URI_NO_TAG}:$${IMAGE_TAG}" - echo "Pushing sandbox image: ${FINAL_IMAGE_URI}" - $_CONTAINER_TOOL push "${FINAL_IMAGE_URI}" + echo "Pushing sandbox image: $${FINAL_IMAGE_URI}" + $_CONTAINER_TOOL push "$${FINAL_IMAGE_URI}" env: - 'GEMINI_SANDBOX=$_CONTAINER_TOOL' diff --git a/package.json b/package.json index e274124c..9b47413d 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,9 @@ "scripts": { "start": "node scripts/start.js", "debug": "cross-env DEBUG=1 node --inspect-brk scripts/start.js", + "auth:npm": "npx google-artifactregistry-auth", + "auth:docker": "gcloud auth configure-docker us-west1-docker.pkg.dev", + "auth": "npm run auth:npm && npm run auth:docker", "generate": "node scripts/generate-git-commit-info.js", "build": "node scripts/build.js", "build:all": "npm run build && npm run build:sandbox",