Update Dockerfile

Dockerfile

@@ -1,6 +1,7 @@
 FROM ubuntu:22.04
 
-# 基础环境设置
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
 ENV DEBIAN_FRONTEND=noninteractive \
     TZ=Asia/Shanghai \
     LANG=en_US.UTF-8 \
@@ -10,179 +11,232 @@ ENV DEBIAN_FRONTEND=noninteractive \
     NPM_CONFIG_UPDATE_NOTIFIER=false \
     PLAYWRIGHT_BROWSERS_PATH=/root/.cache/ms-playwright \
     PORT=7860 \
-    HOME=/root
+    HOME=/root \
+    ZSH=/root/.oh-my-zsh \
+    RUN_AS_ROOT=1
 
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-# 一次性安装所有系统依赖（包括Playwright/Chromium运行的所有库）
+# ------------------------------------------------------------
+# 1) 系统基础 + 所有编译/运行依赖（含 Playwright/Chromium 全量系统库）
+# ------------------------------------------------------------
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    # 基础工具
-    ca-certificates \
-    curl \
-    wget \
-    git \
-    git-lfs \
-    sudo \
-    openssh-client \
-    gnupg \
-    dirmngr \
-    lsb-release \
-    software-properties-common \
-    apt-transport-https \
-    locales \
-    tzdata \
-    # 编辑器/查看器
-    vim \
-    nano \
-    less \
-    jq \
-    tree \
-    # 压缩/归档
-    zip \
-    unzip \
-    p7zip-full \
-    tar \
-    xz-utils \
-    bzip2 \
-    gzip \
-    # 网络工具
-    iproute2 \
-    net-tools \
-    dnsutils \
-    iputils-ping \
-    netcat-openbsd \
-    telnet \
-    traceroute \
-    # 进程/系统工具
-    procps \
-    htop \
-    tmux \
-    screen \
-    lsof \
-    strace \
-    psmisc \
-    # 构建工具链（编译任何软件都可能需要）
-    build-essential \
-    pkg-config \
-    cmake \
-    ninja-build \
-    autoconf \
-    automake \
-    libtool \
-    m4 \
-    flex \
-    bison \
-    # Python开发头文件（编译Python包需要）
-    python3 \
-    python3-pip \
-    python3-venv \
-    python3-dev \
-    python-is-python3 \
-    libssl-dev \
-    zlib1g-dev \
-    libbz2-dev \
-    libreadline-dev \
-    libsqlite3-dev \
-    libncurses5-dev \
-    libncursesw5-dev \
-    libffi-dev \
-    liblzma-dev \
-    # 多媒体/字体（Chrome和Playwright需要）
-    ffmpeg \
-    fonts-liberation \
-    fonts-noto-cjk \
-    fonts-noto-color-emoji \
-    fontconfig \
-    libfontconfig1 \
-    libfreetype6 \
-    # Playwright/Chromium 运行的所有系统依赖（Ubuntu 22.04）
-    libasound2 \
-    libatk-bridge2.0-0 \
-    libatk1.0-0 \
-    libc6 \
-    libcairo2 \
-    libcups2 \
-    libdbus-1-3 \
-    libdrm2 \
-    libexpat1 \
-    libgbm1 \
-    libgcc-s1 \
-    libglib2.0-0 \
-    libgtk-3-0 \
-    libnspr4 \
-    libnss3 \
-    libpango-1.0-0 \
-    libpangocairo-1.0-0 \
-    libstdc++6 \
-    libx11-6 \
-    libx11-xcb1 \
-    libxcb1 \
-    libxcomposite1 \
-    libxcursor1 \
-    libxdamage1 \
-    libxext6 \
-    libxfixes3 \
-    libxi6 \
-    libxkbcommon0 \
-    libxrandr2 \
-    libxrender1 \
-    libxshmfence1 \
-    libxss1 \
-    libxtst6 \
-    # 其他常用库
-    libxml2-dev \
-    libxslt1-dev \
-    libjpeg-dev \
-    libpng-dev \
-    libtiff-dev \
-    libopenjp2-7-dev \
-    libwebp-dev \
-    libmagic-dev \
-    tesseract-ocr \
+    ca-certificates curl wget git git-lfs sudo \
+    gnupg dirmngr lsb-release software-properties-common \
+    locales tzdata apt-transport-https \
+    # 常用工具
+    vim nano less jq tree htop tmux screen \
+    zip unzip p7zip-full tar xz-utils bzip2 gzip \
+    rsync openssh-client net-tools dnsutils iputils-ping \
+    netcat-openbsd telnet traceroute \
+    # 构建工具链
+    build-essential pkg-config cmake ninja-build \
+    autoconf automake libtool m4 flex bison \
+    # Python 开发头文件
+    python3 python3-pip python3-venv python3-dev python-is-python3 \
+    libssl-dev zlib1g-dev libbz2-dev libreadline-dev \
+    libsqlite3-dev libncurses5-dev libncursesw5-dev \
+    libffi-dev liblzma-dev \
+    # 多媒体/字体/图像库
+    ffmpeg fonts-liberation fonts-noto-cjk \
+    fonts-noto-color-emoji fontconfig libfontconfig1 libfreetype6 \
+    tesseract-ocr libtiff-dev libopenjp2-7-dev libwebp-dev \
+    # Playwright/Chromium 运行时全量依赖（Ubuntu 22.04）
+    libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 \
+    libcups2 libdbus-1-3 libdrm2 libexpat1 libgbm1 libgcc-s1 \
+    libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 \
+    libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 \
+    libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 \
+    libxi6 libxkbcommon0 libxrandr2 libxrender1 libxshmfence1 \
+    libxss1 libxtst6 libatspi2.0-0 libwayland-client0 \
+    libwayland-cursor0 libwayland-egl1 libwayland-server0 \
+    libxkbfile1 libcurl4 \
+    # Zsh 必备
+    zsh fonts-powerline \
+    # Docker 依赖
+    iptables \
     && locale-gen en_US.UTF-8 \
     && update-locale LANG=en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# 升级 pip 并安装 Python 常用包 + Playwright
-RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel \
-    && python3 -m pip install --no-cache-dir \
-        playwright \
-        pyautogui \
-        pillow \
-        numpy \
-        pandas \
-        requests \
-        bs4 \
-        lxml \
-        fake-useragent \
-    && rm -rf /root/.cache/pip
-
-# 安装 Node.js 20.x（Playwright需要较新Node）
+# ------------------------------------------------------------
+# 2) 安装 Docker CLI（容器内可用 docker 命令，如 HF Spaces 支持 DinD）
+# ------------------------------------------------------------
+RUN install -m 0755 -d /etc/apt/keyrings \
+    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
+    && chmod a+r /etc/apt/keyrings/docker.gpg \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu jammy stable" \
+    > /etc/apt/sources.list.d/docker.list \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends docker-ce-cli docker-compose-plugin docker-buildx-plugin \
+    && rm -rf /var/lib/apt/lists/*
+
+# ------------------------------------------------------------
+# 3) 安装 Node.js 20.x（Playwright 需要）
+# ------------------------------------------------------------
 RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
-    && apt-get install -y nodejs \
+    && apt-get install -y --no-install-recommends nodejs \
     && npm install -g npm@latest \
     && rm -rf /var/lib/apt/lists/*
 
-# 安装 Playwright Chromium 及其依赖
-RUN playwright install chromium \
-    && playwright install-deps chromium \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/.cache/ms-playwright/ffmpeg
+# ------------------------------------------------------------
+# 4) Zsh + Oh-my-zsh + Powerlevel10k（完美主题配置）
+# ------------------------------------------------------------
+RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended \
+    && git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH}/custom/themes/powerlevel10k \
+    && git clone --depth=1 https://github.com/zsh-users/zsh-autosuggestions ${ZSH}/custom/plugins/zsh-autosuggestions \
+    && git clone --depth=1 https://github.com/zsh-users/zsh-syntax-highlighting ${ZSH}/custom/plugins/zsh-syntax-highlighting \
+    && git clone --depth=1 https://github.com/zsh-users/zsh-completions ${ZSH}/custom/plugins/zsh-completions
 
-# 安装 code-server (VS Code Web版)
-RUN curl -fsSL https://code-server.dev/install.sh | sh \
-    && rm -rf /var/lib/apt/lists/*
+# Powerlevel10k 配置（高度优化、美观且兼容无 Nerd Fonts 环境）
+RUN cat > /root/.p10k.zsh <<'EOF'
+# 简化的 Powerlevel10k 配置，避免字体缺失导致的乱码
+'status'=forground%or%K{016c}F{11::+-% } -%<< 
+POWERLEVEL9K_DISABLE_HOT_RELOAD=true
+
+# 左侧提示符元素
+POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(os_icon context dir vcs)
+# 右侧提示符元素
+POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status root_indicator background_jobs time)
+
+# 目录颜色
+POWERLEVEL9K_DIR_BACKGROUND='blue'
+POWERLEVEL9K_DIR_FOREGROUND='white'
+POWERLEVEL9K_SHORTEN_STRATEGY="truncate_middle"
+POWERLEVEL9K_SHORTEN_DIR_LENGTH=3
+
+# Git 状态
+POWERLEVEL9K_VCS_CLEAN_BACKGROUND='green'
+POWERLEVEL9K_VCS_CLEAN_FOREGROUND='black'
+POWERLEVEL9K_VCS_MODIFIED_BACKGROUND='yellow'
+POWERLEVEL9K_VCS_MODIFIED_FOREGROUND='black'
+POWERLEVEL9K_VCS_UNTRACKED_BACKGROUND='magenta'
+POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND='black'
+
+# 状态码
+POWERLEVEL9K_STATUS_OK_BACKGROUND='black'
+POWERLEVEL9K_STATUS_OK_FOREGROUND='green'
+POWERLEVEL9K_STATUS_ERROR_BACKGROUND='black'
+POWERLEVEL9K_STATUS_ERROR_FOREGROUND='red'
+
+# 时间
+POWERLEVEL9K_TIME_BACKGROUND='black'
+POWERLEVEL9K_TIME_FOREGROUND='white'
+POWERLEVEL9K_TIME_FORMAT='%D{%H:%M:%S}'
+
+# 隐藏用户@主机（已经是 root）缩减长度
+POWERLEVEL9K_CONTEXT_TEMPLATE="%n"
+POWERLEVEL9K_CONTEXT_DEFAULT_BACKGROUND='black'
+POWERLEVEL9K_CONTEXT_DEFAULT_FOREGROUND='white'
+
+# 图标调整（避免乱码）
+POWERLEVEL9K_OS_ICON_CONTENT_EXPANSION='⭐'
+POWERLEVEL9K_VCS_BRANCH_ICON=''
+
+# Instant Prompt（加速启动）
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+EOF
+
+# Zsh 主配置
+RUN cat > /root/.zshrc <<'EOF'
+export ZSH="$HOME/.oh-my-zsh"
+export LANG=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+
+ZSH_THEME="powerlevel10k/powerlevel10k"
+plugins=(
+    git
+    zsh-autosuggestions
+    zsh-syntax-highlighting
+    zsh-completions
+    docker
+    docker-compose
+    command-not-found
+)
+
+source $ZSH/oh-my-zsh.sh
+
+# 历史记录优化
+HISTFILE=~/.zsh_history
+HISTSIZE=10000
+SAVEHIST=10000
+setopt appendhistory
+setopt sharehistory
+setopt hist_ignore_space
+setopt hist_ignore_all_dups
+
+# 别名
+alias ll='ls -alF'
+alias la='ls -A'
+alias l='ls -CF'
+alias ..='cd ..'
+alias ...='cd ../..'
+alias python='python3'
+alias pip='pip3'
+alias zshconfig='nano ~/.zshrc'
+alias cls='clear'
+
+# Powerlevel10k 配置
+[[ -f ~/.p10k.zsh ]] && source ~/.p10k.zsh
+
+# 自动补全
+autoload -Uz compinit && compinit -C
+EOF
 
-# 创建 Code Server 配置目录并写入优化配置
+RUN chsh -s $(which zsh) root
+
+# ------------------------------------------------------------
+# 5) Python Playwright + 浏览器
+# ------------------------------------------------------------
+RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel \
+    && python3 -m pip install --no-cache-dir \
+    playwright \
+    pyautogui \
+    pillow \
+    numpy \
+    pandas \
+    requests \
+    beautifulsoup4 \
+    lxml \
+    fake-useragent \
+    scrapy \
+    && python3 -m playwright install chromium \
+    && python3 -m playwright install-deps chromium \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/.cache/pip
+
+# ------------------------------------------------------------
+# 6) Google Chrome（仅 amd64，arm64 跳过）
+# ------------------------------------------------------------
+RUN arch="$(dpkg --print-architecture)" \
+    && if [ "${arch}" = "amd64" ]; then \
+    install -m 0755 -d /etc/apt/keyrings \
+    && curl -fsSL https://dl.google.com/linux/linux_signing_key.pub | gpg --dearmor -o /etc/apt/keyrings/google-chrome.gpg \
+    && chmod a+r /etc/apt/keyrings/google-chrome.gpg \
+    && echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main" \
+    > /etc/apt/sources.list.d/google-chrome.list \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends google-chrome-stable \
+    && rm -rf /var/lib/apt/lists/*; \
+    else echo "Skip Chrome on ${arch}"; fi
+
+# ------------------------------------------------------------
+# 7) Code-server（VS Code Web）
+# ------------------------------------------------------------
+RUN curl -fsSL https://code-server.dev/install.sh | sh
+
+# ------------------------------------------------------------
+# 8) Code-server 配置（root 用户、优化体验）
+# ------------------------------------------------------------
 RUN mkdir -p /root/.config/code-server \
     && mkdir -p /root/.local/share/code-server/User \
-    && cat > /root/.config/code-server/config.yaml <<'EOF'
+    && cat > /root/.config/code-server/config.yaml <<EOF
 bind-addr: 0.0.0.0:7860
 auth: none
 disable-telemetry: true
 disable-update-check: true
 EOF
 
-# 创建 VS Code 用户设置（最佳实践配置）
+# VS Code 用户设置（最佳实践）
 RUN cat > /root/.local/share/code-server/User/settings.json <<'EOF'
 {
     "workbench.colorTheme": "Default Dark+",
@@ -193,15 +247,13 @@ RUN cat > /root/.local/share/code-server/User/settings.json <<'EOF'
     "extensions.autoUpdate": false,
     "security.workspace.trust.enabled": false,
     "security.workspace.trust.startupPrompt": "never",
-    "terminal.integrated.defaultProfile.linux": "bash",
+    "terminal.integrated.defaultProfile.linux": "zsh",
     "terminal.integrated.profiles.linux": {
-        "bash": {
-            "path": "bash",
-            "icon": "terminal-bash"
-        }
+        "zsh": { "path": "/usr/bin/zsh", "icon": "terminal" },
+        "bash": { "path": "/bin/bash", "icon": "terminal-bash" }
     },
+    "terminal.integrated.fontFamily": "monospace",
     "python.defaultInterpreterPath": "/usr/bin/python3",
-    "python.terminal.activateEnvironmentInTerminal": true,
     "git.enableSmartCommit": true,
     "git.confirmSync": false,
     "editor.formatOnSave": true,
@@ -209,18 +261,15 @@ RUN cat > /root/.local/share/code-server/User/settings.json <<'EOF'
     "editor.tabSize": 4,
     "editor.insertSpaces": true,
     "editor.wordWrap": "on",
-    "files.exclude": {
-        "**/.git": false
-    },
+    "files.exclude": { "**/.git": false },
     "explorer.confirmDragAndDrop": false,
     "explorer.confirmDelete": false
 }
 EOF
 
-# 预装常用扩展（不阻塞构建，尽量装）
+# 预装常用扩展（不阻塞构建）
 RUN code-server --install-extension ms-python.python --force || true \
     && code-server --install-extension ms-toolsai.jupyter --force || true \
-    && code-server --install-extension ms-toolsai.vscode-jupyter-cell-tags --force || true \
     && code-server --install-extension ms-azuretools.vscode-docker --force || true \
     && code-server --install-extension redhat.vscode-yaml --force || true \
     && code-server --install-extension formulahendry.auto-close-tag --force || true \
@@ -234,14 +283,11 @@ RUN code-server --install-extension ms-python.python --force || true \
     && code-server --install-extension yzhang.markdown-all-in-one --force || true \
     || true
 
-# 创建工作目录（HF Spaces默认会挂载/data如果有持久化存储）
-RUN mkdir -p /data/workspace /root/workspace \
-    && ln -sf /data/workspace /workspace 2>/dev/null || true
-
-WORKDIR /data/workspace
+# 工作目录
+RUN mkdir -p /workspace
+WORKDIR /workspace
 
-# 暴露 HF Space 默认端口
 EXPOSE 7860
 
-# 入口命令（使用exec确保PID 1正确）
-ENTRYPOINT ["code-server", "--bind-addr", "0.0.0.0:7860", "--auth", "none", "--disable-telemetry", "--disable-update-check", "/data/workspace"]
+# 直接用 root 启动（符合你的要求）
+CMD ["/usr/bin/code-server", "--bind-addr", "0.0.0.0:7860", "--auth", "none", "--disable-telemetry", "--disable-update-check", "/workspace"]