jcarr
/
gemini-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add sandboxImageName in package.json (#1219)

This commit is contained in:
Leo 2025-06-19 19:50:34 +01:00 committed by GitHub
parent 43203926b8
commit 0ebac0b896
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/cli/package.json
View File

@ -26,7 +26,8 @@
"dist" "dist"
], ],
"config": { "config": {
"sandboxImageUri": "gemini-cli-sandbox" "sandboxImageUri": "gemini-cli-sandbox",
"sandboximageName": "gemini-cli-sandbox"
}, },
"dependencies": { "dependencies": {
"@gemini-cli/core": "file:../core", "@gemini-cli/core": "file:../core",

2
packages/cli/src/config/sandboxConfig.ts
View File

@ -91,7 +91,7 @@ export async function loadSandboxConfig(
const image = const image =
argv['sandbox-image'] ?? argv['sandbox-image'] ??
process.env.GEMINI_SANDBOX_IMAGE ?? process.env.GEMINI_SANDBOX_IMAGE ??
packageJson?.config?.sandboxImageUri; packageJson?.config?.sandboximageName;
return command && image ? { command, image } : undefined; return command && image ? { command, image } : undefined;
} }

1
packages/cli/src/utils/package.ts
View File

@ -14,6 +14,7 @@ import path from 'path';
export type PackageJson = BasePackageJson & { export type PackageJson = BasePackageJson & {
config?: { config?: {
sandboxImageUri?: string; sandboxImageUri?: string;
sandboximageName?: string;
}; };
}; };

2
scripts/build_sandbox.js
View File

@ -61,7 +61,7 @@ if (sandboxCommand === 'sandbox-exec') {
console.log(`using ${sandboxCommand} for sandboxing`); console.log(`using ${sandboxCommand} for sandboxing`);
const baseImage = cliPkgJson.config.sandboxImageUri; const baseImage = cliPkgJson.config.sandboximageName;
const customImage = argv.i; const customImage = argv.i;
const baseDockerfile = 'Dockerfile'; const baseDockerfile = 'Dockerfile';
const customDockerfile = argv.f; const customDockerfile = argv.f;

1
scripts/prepare-cli-packagejson.js
View File

@ -45,6 +45,7 @@ if (!cliPackageJson.config) {
cliPackageJson.config = {}; cliPackageJson.config = {};
} }
cliPackageJson.config.sandboxImageUri = containerImageUri; cliPackageJson.config.sandboxImageUri = containerImageUri;
cliPackageJson.config.sandboximageName = containerImageName;
// Remove 'prepublishOnly' from scripts if it exists // Remove 'prepublishOnly' from scripts if it exists
if (cliPackageJson.scripts && cliPackageJson.scripts.prepublishOnly) { if (cliPackageJson.scripts && cliPackageJson.scripts.prepublishOnly) {