Update Dockerfile

Dockerfile

@@ -1,5 +1,4 @@
 FROM ubuntu:22.04
-
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ENV DEBIAN_FRONTEND=noninteractive \
@@ -15,7 +14,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
     ZSH=/root/.oh-my-zsh
 
 # ------------------------------------------------------------
-# 1) 基础系统 + 所有工具链 + Playwright/Chromium 依赖 + zsh
+# 1) 基础系统 + 工具链 + Playwright/Chromium 依赖 + zsh
 # ------------------------------------------------------------
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates curl wget git git-lfs sudo \
@@ -32,141 +31,60 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     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 \
-    libxml2-dev libxslt1-dev libjpeg-dev libpng-dev libtiff-dev libopenjp2-7-dev libwebp-dev \
-    libmagic-dev \
-    ffmpeg tesseract-ocr \
-    fontconfig fonts-liberation fonts-noto-cjk fonts-noto-color-emoji \
-    iptables uidmap slirp4netns fuse-overlayfs \
-    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 \
-    && locale-gen en_US.UTF-8 \
-    && update-locale LANG=en_US.UTF-8 \
-    && rm -rf /var/lib/apt/lists/*
-
-# ------------------------------------------------------------
-# 2) Docker Engine (dockerd + cli) - rootless 依赖也装上
-# ------------------------------------------------------------
-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 docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin \
-    && rm -rf /var/lib/apt/lists/*
-
-# ------------------------------------------------------------
-# 3) Node.js v25 (最新版本)
-# ------------------------------------------------------------
-RUN set -eux; \
-    arch="$(dpkg --print-architecture)"; \
-    case "$arch" in \
-      amd64) node_arch="x64" ;; \
-      arm64) node_arch="arm64" ;; \
-      *) echo "Unsupported architecture: $arch" >&2; exit 1 ;; \
-    esac; \
-    NODE_VERSION=$(curl -fsSL https://nodejs.org/dist/latest-v25.x/ | grep -oP 'href="node-v25\.\d+\.\d+-linux-'${node_arch}'\.tar\.xz"' | head -1 | grep -oP 'v25\.\d+\.\d+'); \
-    if [ -z "$NODE_VERSION" ]; then NODE_VERSION="v25.0.0"; fi; \
-    echo "Installing Node.js $NODE_VERSION"; \
-    curl -fsSL "https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-${node_arch}.tar.xz" -o node.tar.xz; \
-    tar -xJf node.tar.xz -C /usr/local --strip-components=1 --no-same-owner; \
-    rm node.tar.xz; \
-    node -v; npm -v; \
-    npm config set update-notifier false; \
-    npm i -g npm@latest; \
-    npm cache clean --force
-
-# ------------------------------------------------------------
-# 4) code-server
-# ------------------------------------------------------------
-RUN curl -fsSL https://code-server.dev/install.sh | sh
-
-# ------------------------------------------------------------
-# 5) Playwright (Python) + Chromium
-# ------------------------------------------------------------
-RUN mkdir -p "${PLAYWRIGHT_BROWSERS_PATH}" \
-    && python3 -m pip install --no-cache-dir -U pip setuptools wheel \
-    && python3 -m pip install --no-cache-dir playwright \
-    && python3 -m playwright install chromium \
-    && python3 -m playwright install-deps chromium \
-    && rm -rf /root/.cache/pip /var/lib/apt/lists/*
-
-# Optional: Google Chrome (amd64 only)
-RUN set -eux; \
-    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/*; \
-    fi
-
-# ------------------------------------------------------------
+    libxml2-dev libxslt1-dev libjpeg-dev libpng-dev libtiff-dev libopenjp2-7-dev libwebp-emoji \
+    iptables uidmap slir ------------------------------------------------------------
 # 6) oh-my-zsh + 高级主题配置
-#    左侧：用户名 + 路径（智能缩短）
-#    右侧：时间
-#    使用 Powerlevel10k 的精简模式，自动适配颜色，无emoji
+# 左侧：用户名 + 路径（智能缩短）
+# 右侧：时间
+# 使用终端自动配色，无 emoji，无硬编码背景色
 # ------------------------------------------------------------
 RUN git clone --depth=1 https://github.com/ohmyzsh/ohmyzsh.git "${ZSH}" \
     && 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"
 
-# 创建自定义主题：使用 zsh 原生颜色系统，自动适应终端
 RUN mkdir -p "${ZSH}/custom/themes" \
     && cat > "${ZSH}/custom/themes/pure-minimal.zsh-theme" <<'THEME'
-# pure-minimal: 自动适应终端配色，无emoji，左右分离
+# pure-minimal: 自动适应终端配色，无emoji，简洁高效
 # 左侧: user@host dir
-# 右侧: time
+# 右侧: 时间
 
-# 检测是否为 root
+# 用户颜色：root红色，普通用户绿色
 local user_color='%F{green}'
-if [[ $EUID -eq 0 ]]; then
-  user_color='%F{red}'
-fi
+[[ $EUID -eq 0 ]] && user_color='%F{red}'
 
-# 左侧: 用户名@主机名 路径
-# %n=用户名, %m=主机名(短), %~=当前路径(家目录显示为~)
-PROMPT='${user_color}%n@%m%f %F{cyan}%~%f %# '
+# 路径颜色：青色
+local path_color='%F{cyan}'
 
-# 右侧: 时间 HH:MM:SS
-RPROMPT='%F{240}%*%f'
+# 时间颜色：灰色(240)
+local time_color='%F{240}'
 
-# 输入命令后主提示符（第二行）
+# 主提示符：用户名@主机名 当前目录
+PROMPT='${user_color}%n@%m%f ${path_color}%~%f %# '
+
+# 右侧时间：HH:MM:SS
+RPROMPT='${time_color}%*%f'
+
+# 多行提示符
 PROMPT2='%F{yellow}...%f %# '
 
-# 终端标题
+# 终端标题栏显示用户@主机:路径
 precmd() { print -Pn "\e]0;%n@%m: %~\a" }
 THEME
 
 RUN cat > /root/.zshrc <<'EOF'
-# Oh My Zsh 配置
 export ZSH="$HOME/.oh-my-zsh"
-
-# 禁用自动更新提示
 zstyle ':omz:update' mode disabled
 export ZSH_DISABLE_COMPFIX=true
 
-# 主题
 ZSH_THEME="pure-minimal"
 
-# 插件
 plugins=(
-  git
-  docker
-  docker-compose
-  zsh-autosuggestions
-  zsh-syntax-highlighting
-  command-not-found
+    git
+    docker
+    docker-compose
+    zsh-autosuggestions
+    zsh-syntax-highlighting
+    command-not-found
 )
 
 source "$ZSH/oh-my-zsh.sh"
@@ -188,13 +106,15 @@ alias pip='pip3'
 alias zshconfig='nano ~/.zshrc'
 alias cls='clear'
 alias reload='source ~/.zshrc'
+alias d='docker'
+alias dc='docker compose'
 
 # 自动补全优化
 autoload -Uz compinit
 compinit -C
 
-# zsh-autosuggestions 绑定
-bindkey '^ ' autosuggest-accept  # Ctrl+空格接受建议
+# zsh-autosuggestions 快捷键：Ctrl+空格 接受建议
+bindkey '^ ' autosuggest-accept
 EOF
 
 # ------------------------------------------------------------
@@ -210,18 +130,17 @@ EOF
 
 RUN cat > /root/.local/share/code-server/User/settings.json <<'EOF'
 {
-  "workbench.startupEditor": "none",
-  "telemetry.telemetryLevel": "off",
-  "update.mode": "none",
-  "extensions.autoCheckUpdates": false,
-  "extensions.autoUpdate": false,
-  "security.workspace.trust.enabled": false,
-
-  "terminal.integrated.defaultProfile.linux": "zsh",
-  "terminal.integrated.profiles.linux": {
-    "zsh": { "path": "/usr/bin/zsh" },
-    "bash": { "path": "/bin/bash" }
-  }
+    "workbench.startupEditor": "none",
+    "telemetry.telemetryLevel": "off",
+    "update.mode": "none",
+    "extensions.autoCheckUpdates": false,
+    "extensions.autoUpdate": false,
+    "security.workspace.trust.enabled": false,
+    "terminal.integrated.defaultProfile.linux": "zsh",
+    "terminal.integrated.profiles.linux": {
+        "zsh": { "path": "/usr/bin/zsh" },
+        "bash": { "path": "/bin/bash" }
+    }
 }
 EOF
 
@@ -244,50 +163,47 @@ set -euo pipefail
 export HOME="${HOME:-/root}"
 export PORT="${PORT:-7860}"
 
-# 尝试启动 Docker 守护进程（HF Spaces 可能不支持，但不影响主服务）
+# 尝试启动 Docker 守护进程（HF Spaces 可能不支持特权，但不影响主服务）
 if command -v dockerd >/dev/null 2>&1; then
-  if ! docker info >/dev/null 2>&1 2>/dev/null; then
-    mkdir -p /var/log /var/run /var/lib/docker
-    
-    echo "[start] attempting to start dockerd..."
-    
-    # 尝试多种启动方式
-    (
-      # 方式1: 直接启动（需要特权）
-      dockerd --host=unix:///var/run/docker.sock \
-        --data-root=/var/lib/docker \
-        --storage-driver=vfs \
-        2>/var/log/dockerd.log &
-    ) 2>/dev/null || true
-    
-    # 等待 docker 就绪（最多5秒）
-    for i in {1..10}; do
-      if docker info >/dev/null 2>&1 2>/dev/null; then
-        echo "[start] dockerd is ready"
-        break
-      fi
-      sleep 0.5
-    done
-    
     if ! docker info >/dev/null 2>&1 2>/dev/null; then
-      echo "[start] dockerd failed to start (expected in many container environments)"
+        mkdir -p /var/log /var/run /var/lib/docker
+        echo "[start] attempting to start dockerd..."
+        
+        # 尝试启动 dockerd
+        (
+            dockerd --host=unix:///var/run/docker.sock \
+                --data-root=/var/lib/docker \
+                --storage-driver=vfs \
+                2>/var/log/dockerd.log &
+        ) 2>/dev/null || true
+        
+        # 等待 docker 就绪（最多5秒）
+        for i in {1..10}; do
+            if docker info >/dev/null 2>&1 2>/dev/null; then
+                echo "[start] dockerd is ready"
+                break
+            fi
+            sleep 0.5
+        done
+        
+        if ! docker info >/dev/null 2>&1 2>/dev/null; then
+            echo "[start] dockerd not available (expected in restricted environments)"
+        fi
     fi
-  fi
 fi
 
 mkdir -p /workspace
 echo "[start] starting code-server on port ${PORT}"
-
 exec code-server \
-  --bind-addr "0.0.0.0:${PORT}" \
-  --auth none \
-  --disable-telemetry \
-  --disable-update-check \
-  /workspace
+    --bind-addr "0.0.0.0:${PORT}" \
+    --auth none \
+    --disable-telemetry \
+    --disable-update-check \
+    /workspace
 EOF
 
 RUN chmod +x /usr/local/bin/start.sh
 
 WORKDIR /workspace
 EXPOSE 7860
-CMD ["/usr/local/bin/start.sh"]
+CMD ["/usr/local/bin/start.sh"]