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

refactor: remove docker tagging step from sandbox publishing (#1223)

This commit is contained in:
Brandon Keiji 2025-06-19 12:19:39 -07:00 committed by GitHub
parent 0ebac0b896
commit 10a83a6395
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -35,11 +35,10 @@
"build:core": "npm run build --workspace packages/core", "build:core": "npm run build --workspace packages/core",
"build:packages": "npm run build:core && npm run build:cli", "build:packages": "npm run build:core && npm run build:cli",
"build:docker": "node scripts/build_sandbox.js -s", "build:docker": "node scripts/build_sandbox.js -s",
"tag:docker": "docker tag gemini-cli-sandbox ${SANDBOX_IMAGE_REGISTRY:?SANDBOX_IMAGE_REGISTRY not set}/${SANDBOX_IMAGE_NAME:?SANDBOX_IMAGE_NAME not set}:$npm_package_version",
"prepare:cli-packagejson": "node scripts/prepare-cli-packagejson.js", "prepare:cli-packagejson": "node scripts/prepare-cli-packagejson.js",
"publish:sandbox": "node scripts/publish-sandbox.js", "publish:sandbox": "node scripts/publish-sandbox.js",
"publish:npm": "npm publish --workspaces ${NPM_PUBLISH_TAG:+--tag=$NPM_PUBLISH_TAG} ${NPM_DRY_RUN:+--dry-run}", "publish:npm": "npm publish --workspaces ${NPM_PUBLISH_TAG:+--tag=$NPM_PUBLISH_TAG} ${NPM_DRY_RUN:+--dry-run}",
"publish:release": "npm run build:packages && npm run prepare:cli-packagejson && npm run build:docker && npm run tag:docker && npm run publish:sandbox && npm run publish:npm", "publish:release": "npm run build:packages && npm run prepare:cli-packagejson && npm run build:docker && npm run publish:sandbox && npm run publish:npm",
"telemetry": "node scripts/telemetry.js", "telemetry": "node scripts/telemetry.js",
"start:gcp": "npm run telemetry -- --target=gcp & npm start" "start:gcp": "npm run telemetry -- --target=gcp & npm start"
}, },

3
packages/cli/package.json
View File

@ -26,8 +26,7 @@
"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?.sandboximageName; packageJson?.config?.sandboxImageUri;
return command && image ? { command, image } : undefined; return command && image ? { command, image } : undefined;
} }

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

@ -14,7 +14,6 @@ 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.sandboximageName; const baseImage = cliPkgJson.config.sandboxImageUri;
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,7 +45,6 @@ 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) {