abbyswag/qwen-code
1
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2025-12-19 09:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sandbox): consolidate dev and prod sandbox (#273)

Browse Source
This commit is contained in:
Brandon Keiji
2025-05-07 14:23:13 +00:00
committed by GitHub
parent 5344853344
commit 739654bb25
6 changed files with 113 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/build.sh
View File

@@ -25,7 +25,6 @@ npm run build --workspaces
# also build container image if sandboxing is enabled
# skip (-s) npm install + build since we did that above
# use (-d) for dev build that can reuse existing image
if scripts/sandbox_command.sh -q; then
scripts/build_sandbox.sh -sd
if scripts/sandbox_command.sh -q && [[ "${BUILD_SANDBOX:-}" =~ ^(1|true)$ ]]; then
scripts/build_sandbox.sh -s
fi

41
scripts/build_sandbox.sh
View File

@@ -30,10 +30,6 @@ SKIP_NPM_INSTALL_BUILD=false
while getopts "sdf:" opt; do
case ${opt} in
s) SKIP_NPM_INSTALL_BUILD=true ;;
d)
DOCKERFILE=Dockerfile-dev
IMAGE+="-dev"
;;
f)
DOCKERFILE=$OPTARG
;;
@@ -54,38 +50,27 @@ if [ "$SKIP_NPM_INSTALL_BUILD" = false ]; then
npm run build --workspaces
fi
# if using Dockerfile-dev, then skip rebuild unless BUILD_SANDBOX is set
# rebuild should not be necessary unless Dockerfile-dev is modified
if [ "$DOCKERFILE" = "Dockerfile-dev" ]; then
if $CMD images -q "$IMAGE" | grep -q . && [ -z "${BUILD_SANDBOX:-}" ]; then
echo "using existing $IMAGE (set BUILD_SANDBOX=true to force rebuild)"
exit 0
fi
fi
# prepare global installation files for prod builds (anything but Dockerfile-dev)
if [ "$DOCKERFILE" != "Dockerfile-dev" ]; then
# pack cli
echo "packing @gemini-code/cli ..."
rm -f packages/cli/dist/gemini-code-cli-*.tgz
npm pack -w @gemini-code/cli --pack-destination ./packages/cli/dist &>/dev/null
# pack server
echo "packing @gemini-code/server ..."
rm -f packages/server/dist/gemini-code-server-*.tgz
npm pack -w @gemini-code/server --pack-destination ./packages/server/dist &>/dev/null
# give node user (used during installation, see Dockerfile) access to these files
chmod 755 packages/*/dist/gemini-code-*.tgz
fi
# prepare global installation files for prod builds
# pack cli
echo "packing @gemini-code/cli ..."
rm -f packages/cli/dist/gemini-code-cli-*.tgz
npm pack -w @gemini-code/cli --pack-destination ./packages/cli/dist &>/dev/null
# pack server
echo "packing @gemini-code/server ..."
rm -f packages/server/dist/gemini-code-server-*.tgz
npm pack -w @gemini-code/server --pack-destination ./packages/server/dist &>/dev/null
# give node user (used during installation, see Dockerfile) access to these files
chmod 755 packages/*/dist/gemini-code-*.tgz
# build container image & prune older unused images
echo "building $IMAGE ... (can be slow first time)"
if [[ "$CMD" == "podman" ]]; then
# use empty --authfile to skip unnecessary auth refresh overhead
$CMD build --authfile=<(echo '{}') -f "$DOCKERFILE" -t "$IMAGE" . >/dev/null
$CMD build --authfile=<(echo '{}') -f "$DOCKERFILE" -t "$IMAGE" .
elif [[ "$CMD" == "docker" ]]; then
# use an empty config directory to skip unnecessary auth refresh overhead
$CMD --config="empty" build -f "$DOCKERFILE" -t "$IMAGE" . >/dev/null
$CMD --config="empty" buildx build -f "$DOCKERFILE" -t "$IMAGE" .
else
$CMD build -f "$DOCKERFILE" -t "$IMAGE" . >/dev/null
fi

7
scripts/start.sh
View File

@@ -22,7 +22,12 @@ node ./scripts/check-build-status.js
# note with sandboxing this flag is passed to the binary inside the sandbox
node_args=()
if [ -n "${DEBUG:-}" ] && ! scripts/sandbox_command.sh -q; then
node_args=(--inspect-brk)
if [ -n "${SANDBOX:-}" ]; then
port="${DEBUG_PORT:-9229}"
node_args=("--inspect-brk=0.0.0.0:$port")
else
node_args=(--inspect-brk)
fi
fi
node_args+=("./packages/cli" "$@")