refactor(devcontainer): 调整 Dockerfile 和 devcontainer 配置
将 DEVCONTAINER 和 SANDBOX 环境变量从 Dockerfile 移至 devcontainer.json, 以提升配置的灵活性和一致性。同时,更新注释内容以准确反映当前安装脚本的功能。
This commit is contained in:
@@ -15,9 +15,6 @@ ARG TZ=Asia/Shanghai
|
|||||||
ENV LANG=zh_CN.UTF-8 \
|
ENV LANG=zh_CN.UTF-8 \
|
||||||
LC_ALL=zh_CN.UTF-8 \
|
LC_ALL=zh_CN.UTF-8 \
|
||||||
TZ=${TZ} \
|
TZ=${TZ} \
|
||||||
# Set `DEVCONTAINER` environment variable to help with orientation
|
|
||||||
DEVCONTAINER=true \
|
|
||||||
SANDBOX=sandbox-devcontainer \
|
|
||||||
# Set the default shell to zsh rather than sh
|
# Set the default shell to zsh rather than sh
|
||||||
SHELL=/bin/zsh \
|
SHELL=/bin/zsh \
|
||||||
# Set the default editor and visual
|
# Set the default editor and visual
|
||||||
@@ -91,7 +88,7 @@ RUN sh -c "$(curl -L -o - https://github.com/deluan/zsh-in-docker/releases/downl
|
|||||||
&& echo "alias gemini='gemini --yolo -m gemini-2.5-pro'" >> /home/usr_vscode/.zshrc \
|
&& echo "alias gemini='gemini --yolo -m gemini-2.5-pro'" >> /home/usr_vscode/.zshrc \
|
||||||
&& echo "alias claude='claude --dangerously-skip-permissions'" >> /home/usr_vscode/.zshrc
|
&& echo "alias claude='claude --dangerously-skip-permissions'" >> /home/usr_vscode/.zshrc
|
||||||
|
|
||||||
# 安装 pnpm 和 Node.js
|
# 安装 pnpm
|
||||||
# https://pnpm.io/installation#in-a-docker-container
|
# https://pnpm.io/installation#in-a-docker-container
|
||||||
RUN wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.zshrc" SHELL="$(which zsh)" zsh - \
|
RUN wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.zshrc" SHELL="$(which zsh)" zsh - \
|
||||||
&& pnpm --version \
|
&& pnpm --version \
|
||||||
|
|||||||
@@ -85,6 +85,8 @@
|
|||||||
"GOOGLE_GEMINI_BASE_URL": "${localEnv:GOOGLE_GEMINI_BASE_URL}",
|
"GOOGLE_GEMINI_BASE_URL": "${localEnv:GOOGLE_GEMINI_BASE_URL}",
|
||||||
"NODE_OPTIONS": "--max-old-space-size=4096",
|
"NODE_OPTIONS": "--max-old-space-size=4096",
|
||||||
"CLAUDE_CONFIG_DIR": "/home/usr_vscode/.claude",
|
"CLAUDE_CONFIG_DIR": "/home/usr_vscode/.claude",
|
||||||
|
"DEVCONTAINER": "true", // https://github.com/anthropics/claude-code/blob/1fe9e369a7c30805189cbbb72eb69c15ed4ec96b/.devcontainer/Dockerfile#L42
|
||||||
|
"SANDBOX": "sandbox-devcontainer", // gemini 显示这个。
|
||||||
"TZ": "${localEnv:TZ:Asia/Shanghai}"
|
"TZ": "${localEnv:TZ:Asia/Shanghai}"
|
||||||
},
|
},
|
||||||
"remoteUser": "usr_vscode",
|
"remoteUser": "usr_vscode",
|
||||||
|
|||||||
Reference in New Issue
Block a user