From 3073c67861806a5312f5a7fa4c1c091507bd4755 Mon Sep 17 00:00:00 2001
From: Brandon Keiji <brandonkeiji@google.com>
Date: Tue, 29 Apr 2025 01:16:42 +0000
Subject: [PATCH] fix: set .npmrc in HOME dir before publishing (#206)

---
 .gcp/Dockerfile.gemini-code-builder |  1 -
 .gcp/dogfood.yaml                   | 13 +++++++++----
 Dockerfile                          |  1 -
 packages/cli/.npmrc                 |  2 --
 packages/cli/Dockerfile.sandbox     |  1 +
 packages/cli/bin/sandbox.sh         |  4 +---
 6 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 packages/cli/.npmrc

diff --git a/.gcp/Dockerfile.gemini-code-builder b/.gcp/Dockerfile.gemini-code-builder
index f8ef6dfa..94499edd 100644
--- a/.gcp/Dockerfile.gemini-code-builder
+++ b/.gcp/Dockerfile.gemini-code-builder
@@ -9,7 +9,6 @@ ENV NODE_VERSION_MAJOR=20
 ENV DOCKER_CLI_VERSION=26.1.3
 ENV BUILDX_VERSION=v0.14.0
 
-
 # Install dependencies for adding NodeSource repository, gcloud, and other tools
 # - curl: for downloading files
 # - gnupg: for managing GPG keys (used by NodeSource & Google Cloud SDK)
diff --git a/.gcp/dogfood.yaml b/.gcp/dogfood.yaml
index 7d8842eb..911fdf46 100644
--- a/.gcp/dogfood.yaml
+++ b/.gcp/dogfood.yaml
@@ -3,10 +3,6 @@ steps:
     entrypoint: 'npm'
     args: ['install']
 
-  - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
-    entrypoint: 'npm'
-    args: ['run', 'auth']
-
   - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
     entrypoint: 'npm'
     args:
@@ -22,6 +18,15 @@ steps:
     entrypoint: 'npm'
     args: ['run', 'prerelease:deps', '--workspaces']
 
+  # A bit of a hack to get the .npmrc into the Dockerfile.sandbox. Should probably streamline this.
+  - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
+    entrypoint: 'cp'
+    args: ['/workspace/.npmrc', '/builder/home/.npmrc']
+
+  - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
+    entrypoint: 'npm'
+    args: ['run', 'auth']
+
   - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
     entrypoint: 'npm'
     args: ['publish', '--tag=head', '--workspace=@gemini-code/cli']
diff --git a/Dockerfile b/Dockerfile
index ebe2327a..894e686e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,4 +35,3 @@ COPY packages/server/dist/gemini-code-server-*.tgz /usr/local/share/npm-global/g
 RUN npm install -g /usr/local/share/npm-global/gemini-code-cli.tgz /usr/local/share/npm-global/gemini-code-server.tgz \
   && npm cache clean --force \
   && rm -f /usr/local/share/npm-global/gemini-code-{cli,server}.tgz
-
diff --git a/packages/cli/.npmrc b/packages/cli/.npmrc
deleted file mode 100644
index e17bb8be..00000000
--- a/packages/cli/.npmrc
+++ /dev/null
@@ -1,2 +0,0 @@
-@gemini-code:registry=https://us-west1-npm.pkg.dev/gemini-code-dev/gemini-code/
-//us-west1-npm.pkg.dev/gemini-code-dev/gemini-code/:always-auth=true
\ No newline at end of file
diff --git a/packages/cli/Dockerfile.sandbox b/packages/cli/Dockerfile.sandbox
index 1d4c4048..1395a547 100644
--- a/packages/cli/Dockerfile.sandbox
+++ b/packages/cli/Dockerfile.sandbox
@@ -23,4 +23,5 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 RUN --mount=type=secret,id=npmrc,dst=/root/.npmrc npm install -g @gemini-code/cli@${CLI_VERSION} --verbose
+
 ENTRYPOINT 'gemini-code'
diff --git a/packages/cli/bin/sandbox.sh b/packages/cli/bin/sandbox.sh
index 8ba697f2..7cfada0f 100755
--- a/packages/cli/bin/sandbox.sh
+++ b/packages/cli/bin/sandbox.sh
@@ -49,6 +49,4 @@ if [ -n "${COLORTERM:-}" ]; then run_args+=(--env COLORTERM="$COLORTERM"); fi
 # this is the preferred mechanism to detect if inside container/sandbox
 run_args+=(--env "SANDBOX=$IMAGE:$TAG-$INDEX")
 
-node_args=("$CLI_PATH" "$@")
-
-docker run "${run_args[@]}" --init --workdir "$WORKDIR" "$REGISTRY/$IMAGE:$TAG" node "${node_args[@]}"
+docker run "${run_args[@]}" --init --workdir "$WORKDIR" "$REGISTRY/$IMAGE:$TAG"
\ No newline at end of file