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) 基础系统 + 所有工具链 + 依赖（修正后的包名）
+# 1) 基础系统 + 工具链（去除 Docker）
 # ------------------------------------------------------------
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates curl wget git git-lfs sudo \
@@ -36,33 +35,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libmagic-dev \
     ffmpeg tesseract-ocr \
     fontconfig fonts-liberation fonts-noto-cjk fonts-noto-color-emoji \
-    iptables uidmap slirp4netns fuse-overlayfs \
+    # Playwright deps
     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 \
+    libatspi2.0-0 libwayland-client0 libwayland-cursor0 libwayland-egl1 libwayland-server0 \
     libxkbfile1 libcurl4 \
     && locale-gen en_US.UTF-8 \
     && update-locale LANG=en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # ------------------------------------------------------------
-# 2) Docker Engine (dockerd + cli)
-# ------------------------------------------------------------
-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 (使用 NodeSource 官方源，最可靠)
+# 2) Node.js 25
 # ------------------------------------------------------------
 RUN curl -fsSL https://deb.nodesource.com/setup_25.x | bash - \
     && apt-get install -y --no-install-recommends nodejs \
@@ -72,12 +58,12 @@ RUN curl -fsSL https://deb.nodesource.com/setup_25.x | bash - \
     && node -v
 
 # ------------------------------------------------------------
-# 4) code-server
+# 3) code-server
 # ------------------------------------------------------------
 RUN curl -fsSL https://code-server.dev/install.sh | sh
 
 # ------------------------------------------------------------
-# 5) Playwright (Python) + Chromium
+# 4) Playwright + Chromium
 # ------------------------------------------------------------
 RUN mkdir -p "${PLAYWRIGHT_BROWSERS_PATH}" \
     && python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel \
@@ -86,7 +72,7 @@ RUN mkdir -p "${PLAYWRIGHT_BROWSERS_PATH}" \
     && rm -rf /root/.cache/pip
 
 # ------------------------------------------------------------
-# 6) Google Chrome (仅 amd64)
+# 5) Google Chrome (amd64 only)
 # ------------------------------------------------------------
 RUN set -eux; \
     arch="$(dpkg --print-architecture)"; \
@@ -95,7 +81,7 @@ RUN set -eux; \
         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; \
+            > /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/*; \
@@ -104,53 +90,29 @@ RUN set -eux; \
     fi
 
 # ------------------------------------------------------------
-# 7) Zsh + Oh-my-zsh + 自定义主题 (无emoji, 自动配色)
+# 6) Zsh + Oh-my-zsh + 圆角边框主题
+# 左侧：╭─ username ~/path ─╮
+# 右侧：╭─ time ─╯
 # ------------------------------------------------------------
 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"
 
-RUN mkdir -p "${ZSH}/custom/themes" \
-    && cat > "${ZSH}/custom/themes/pure-minimal.zsh-theme" <<'THEME'
-# pure-minimal: 自��适应终端配色，无emoji
-# 左侧: 用户名@主机名 路径
-# 右侧: 时间 HH:MM:SS
-
-# 颜色定义 (zsh 标准色码)
-local user_color='%F{green}'
-[[ $EUID -eq 0 ]] && user_color='%F{red}'
-
-local path_color='%F{cyan}'
-local time_color='%F{240}'
-
-# 左侧提示符: user@host ~/path
-PROMPT='${user_color}%n@%m%f ${path_color}%~%f %# '
-
-# 右侧提示符: 时间
-RPROMPT='${time_color}%*%f'
-
-# 第二行提示符
-PROMPT2='%F{yellow}...%f %# '
-
-# 更新终端标题
-precmd() { print -Pn "\e]0;%n@%m: %~\a" }
-THEME
-
 RUN cat > /root/.zshrc <<'EOF'
 export ZSH="$HOME/.oh-my-zsh"
+export LANG=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
 
 # 禁用更新提示
 zstyle ':omz:update' mode disabled
 export ZSH_DISABLE_COMPFIX=true
 
 # 主题
-ZSH_THEME="pure-minimal"
+ZSH_THEME="rounded-minimal"
 
 # 插件
 plugins=(
     git
-    docker
-    docker-compose
     zsh-autosuggestions
     zsh-syntax-highlighting
     command-not-found
@@ -164,7 +126,7 @@ HISTSIZE=50000
 SAVEHIST=50000
 setopt appendhistory sharehistory hist_ignore_space hist_ignore_all_dups
 
-# 别名
+# 常用别名
 alias ll='ls -alF --color=auto'
 alias la='ls -A --color=auto'
 alias l='ls -CF --color=auto'
@@ -175,21 +137,49 @@ alias pip='pip3'
 alias zshconfig='nano ~/.zshrc'
 alias cls='clear'
 alias reload='source ~/.zshrc'
-alias d='docker'
-alias dc='docker compose'
+alias c='clear'
 
 # 自动补全优化
 autoload -Uz compinit && compinit -C
 
-# zsh-autosuggestions 快捷键
+# zsh-autosuggestions 快捷键：Ctrl+空格接受建议
 bindkey '^ ' autosuggest-accept
 EOF
 
-# 默认 shell 改为 zsh
+# 创建自定义圆角主题
+RUN mkdir -p "${ZSH}/custom/themes" \
+    && cat > "${ZSH}/custom/themes/rounded-minimal.zsh-theme" <<'THEME'
+# Rounded box theme - 圆角边框风格
+# 左侧：╭─ username ~/path ─╮
+#       ╰─▶ 
+# 右侧：╭─ time ─╯
+
+# 颜色定义
+local left_bracket='%F{green}'      # 左边框线颜色（绿色）
+local right_bracket='%F{cyan}'      # 右边框线颜色（青色）
+local user_color='%F{yellow}'       # 用户名（黄色）
+local path_color='%F{blue}'         # 路径（蓝色）
+local time_color='%F{240}'          # 时间（灰色）
+local reset='%f'                    # 重置
+
+# 提示符内容
+# ╭─ username ~/path ─╮
+# ╰─▶ 
+PROMPT='${left_bracket}╭─%f ${user_color}%n%f ${path_color}%~%f ${left_bracket}─╮%f
+${left_bracket}╰─%f '
+
+# 右侧提示符：时间带圆角框
+RPROMPT='${right_bracket}╭─%f ${time_color}%*%f ${right_bracket}─╯%f'
+
+# 第二行提示符（续行）
+PROMPT2='${left_bracket}│ %_%f${reset} '
+EOF
+
+# 设置默认 shell
 RUN chsh -s $(which zsh) root
 
 # ------------------------------------------------------------
-# 8) code-server 配置
+# 7) code-server 配置
 # ------------------------------------------------------------
 RUN mkdir -p /root/.config/code-server /root/.local/share/code-server/User \
     && cat > /root/.config/code-server/config.yaml <<'EOF'
@@ -215,7 +205,7 @@ RUN cat > /root/.local/share/code-server/User/settings.json <<'EOF'
 }
 EOF
 
-# 预装常用扩展
+# 预装扩展
 RUN code-server --install-extension ms-python.python --force 2>/dev/null || true \
     && code-server --install-extension ms-toolsai.jupyter --force 2>/dev/null || true \
     && code-server --install-extension ms-azuretools.vscode-docker --force 2>/dev/null || true \
@@ -225,57 +215,12 @@ RUN code-server --install-extension ms-python.python --force 2>/dev/null || true
     && code-server --install-extension eamodio.gitlens --force 2>/dev/null || true
 
 # ------------------------------------------------------------
-# 9) 启动脚本 (尝试启动 dockerd，然后启动 code-server)
+# 8) 工作目录设为家目录(~)
 # ------------------------------------------------------------
-RUN cat > /usr/local/bin/start.sh <<'EOF'
-#!/usr/bin/env bash
-set -euo pipefail
-
-export HOME="${HOME:-/root}"
-export PORT="${PORT:-7860}"
-
-# 尝试启动 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..."
-        
-        # 后台启动 dockerd
-        (
-            dockerd --host=unix:///var/run/docker.sock \
-                --data-root=/var/lib/docker \
-                --storage-driver=vfs \
-                2>/var/log/dockerd.log
-        ) &
-        
-        # 等待最多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
+WORKDIR /root
 
-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
-EOF
-
-RUN chmod +x /usr/local/bin/start.sh
-
-WORKDIR /workspace
+# ------------------------------------------------------------
+# 9) 启动（直接启动，无 Docker 检查）
+# ------------------------------------------------------------
 EXPOSE 7860
-CMD ["/usr/local/bin/start.sh"]
+CMD ["code-server", "--bind-addr", "0.0.0.0:7860", "--auth", "none", "--disable-telemetry", "--disable-update-check", "/root"]