diff options
| -rw-r--r-- | packages/cli/package.json | 3 | ||||
| -rw-r--r-- | packages/cli/src/config/sandboxConfig.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/utils/package.ts | 1 | ||||
| -rw-r--r-- | scripts/build_sandbox.js | 2 | ||||
| -rw-r--r-- | scripts/prepare-cli-packagejson.js | 1 |
5 files changed, 6 insertions, 3 deletions
diff --git a/packages/cli/package.json b/packages/cli/package.json index 6caa312f..c6eab170 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -26,7 +26,8 @@ "dist" ], "config": { - "sandboxImageUri": "gemini-cli-sandbox" + "sandboxImageUri": "gemini-cli-sandbox", + "sandboximageName": "gemini-cli-sandbox" }, "dependencies": { "@gemini-cli/core": "file:../core", diff --git a/packages/cli/src/config/sandboxConfig.ts b/packages/cli/src/config/sandboxConfig.ts index e0adf0ac..fc444af6 100644 --- a/packages/cli/src/config/sandboxConfig.ts +++ b/packages/cli/src/config/sandboxConfig.ts @@ -91,7 +91,7 @@ export async function loadSandboxConfig( const image = argv['sandbox-image'] ?? process.env.GEMINI_SANDBOX_IMAGE ?? - packageJson?.config?.sandboxImageUri; + packageJson?.config?.sandboximageName; return command && image ? { command, image } : undefined; } diff --git a/packages/cli/src/utils/package.ts b/packages/cli/src/utils/package.ts index d53a0234..47a08b32 100644 --- a/packages/cli/src/utils/package.ts +++ b/packages/cli/src/utils/package.ts @@ -14,6 +14,7 @@ import path from 'path'; export type PackageJson = BasePackageJson & { config?: { sandboxImageUri?: string; + sandboximageName?: string; }; }; diff --git a/scripts/build_sandbox.js b/scripts/build_sandbox.js index 941fa7f6..8098d6f7 100644 --- a/scripts/build_sandbox.js +++ b/scripts/build_sandbox.js @@ -61,7 +61,7 @@ if (sandboxCommand === 'sandbox-exec') { console.log(`using ${sandboxCommand} for sandboxing`); -const baseImage = cliPkgJson.config.sandboxImageUri; +const baseImage = cliPkgJson.config.sandboximageName; const customImage = argv.i; const baseDockerfile = 'Dockerfile'; const customDockerfile = argv.f; diff --git a/scripts/prepare-cli-packagejson.js b/scripts/prepare-cli-packagejson.js index 187dd283..4a3e914d 100644 --- a/scripts/prepare-cli-packagejson.js +++ b/scripts/prepare-cli-packagejson.js @@ -45,6 +45,7 @@ if (!cliPackageJson.config) { cliPackageJson.config = {}; } cliPackageJson.config.sandboxImageUri = containerImageUri; +cliPackageJson.config.sandboximageName = containerImageName; // Remove 'prepublishOnly' from scripts if it exists if (cliPackageJson.scripts && cliPackageJson.scripts.prepublishOnly) { |