chore: 更新Docker配置并添加部署脚本

• 优化Dockerfile构建步骤
• 新增entrypoint.sh启动脚本
• 添加99-custom-setup.sh初始化脚本

99-custom-setup.sh

@@ -0,0 +1,44 @@
+#!/command/with-contenv bash
+# This script is executed by S6 overlay during container initialization.
+set -e
+
+echo "[custom-setup] Starting custom setup script (99-custom-setup.sh)..."
+
+# Attempt to install VS Code extensions
+# The user for linuxserver.io images is typically 'abc' (PUID/PGID 1000/1000)
+# Extensions are installed into the user's data directory, usually within /config
+
+EXTENSIONS_TO_INSTALL=(
+  "ms-python.python"       # Python extension by Microsoft
+  "dbaeumer.vscode-eslint" # ESLint extension
+)
+
+# Check if openvscode-server or code-server command is available and try to install extensions
+# It's important to run this as the correct user (abc)
+INSTALL_CMD=""
+if command -v openvscode-server &> /dev/null; then
+  INSTALL_CMD="openvscode-server"
+elif command -v code-server &> /dev/null; then
+  INSTALL_CMD="code-server"
+fi
+
+if [ -n "$INSTALL_CMD" ]; then
+  echo "[custom-setup] Found command: $INSTALL_CMD. Attempting to install extensions..."
+  for EXT_ID in "${EXTENSIONS_TO_INSTALL[@]}"; do
+    echo "[custom-setup] Installing extension: $EXT_ID"
+    if su -ls /bin/bash abc -c "$INSTALL_CMD --install-extension $EXT_ID --force"; then
+      echo "[custom-setup] Successfully installed $EXT_ID (or it was already installed)."
+    else
+      echo "[custom-setup] WARN: Failed to install extension $EXT_ID. Please try installing it manually from the VS Code UI."
+    fi
+  done
+else
+  echo "[custom-setup] WARN: Neither 'openvscode-server' nor 'code-server' command found in PATH. Skipping automatic extension installation."
+fi
+
+echo "[custom-setup] Extension installation process finished."
+
+# You can add other custom setup tasks here if needed.
+
+echo "[custom-setup] Custom setup script finished."
+

Dockerfile

@@ -1,70 +1,29 @@
-FROM ghcr.io/coder/coder:latest
+FROM codercom/code-server:latest
 
 USER root
 
 RUN apk add curl unzip
 
-# Create directory for the Terraform CLI (and assets)
-RUN mkdir -p /opt/terraform
-
-# Terraform is already included in the official Coder image.
-# See https://github.com/coder/coder/blob/main/scripts/Dockerfile.base#L15
-# If you need to install a different version of Terraform, you can do so here.
-# The below step is optional if you wish to keep the existing version.
-# See https://github.com/coder/coder/blob/main/provisioner/terraform/install.go#L23-L24
-# for supported Terraform versions.
-ARG TERRAFORM_VERSION=1.11.0
-RUN apk update && \
-    curl -LOs https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
-    && unzip -o terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
-    && mv terraform /opt/terraform \
-    && rm terraform_${TERRAFORM_VERSION}_linux_amd64.zip
-ENV PATH=/opt/terraform:${PATH}
-
-# Additionally, a Terraform mirror needs to be configured
-# to download the Terraform providers used in Coder templates.
-# There are two options:
-
-# Option 1) Use a filesystem mirror.
-#  We can seed this at build-time or by mounting a volume to
-#  /opt/terraform/plugins in the container.
-#  https://developer.hashicorp.com/terraform/cli/config/config-file#filesystem_mirror
-#  Be sure to add all the providers you use in your templates to /opt/terraform/plugins
-
-RUN mkdir -p /home/coder/.terraform.d/plugins/registry.terraform.io
-ADD filesystem-mirror-example.tfrc /home/coder/.terraformrc
-
-# Optionally, we can "seed" the filesystem mirror with common providers.
-# Comment out lines 40-49 if you plan on only using a volume or network mirror:
-WORKDIR /home/coder/.terraform.d/plugins/registry.terraform.io
-ARG CODER_PROVIDER_VERSION=2.2.0
-RUN echo "Adding coder/coder v${CODER_PROVIDER_VERSION}" \
-    && mkdir -p coder/coder && cd coder/coder \
-    && curl -LOs https://github.com/coder/terraform-provider-coder/releases/download/v${CODER_PROVIDER_VERSION}/terraform-provider-coder_${CODER_PROVIDER_VERSION}_linux_amd64.zip
-ARG DOCKER_PROVIDER_VERSION=3.0.2
-RUN echo "Adding kreuzwerker/docker v${DOCKER_PROVIDER_VERSION}" \
-    && mkdir -p kreuzwerker/docker && cd kreuzwerker/docker \
-    && curl -LOs https://github.com/kreuzwerker/terraform-provider-docker/releases/download/v${DOCKER_PROVIDER_VERSION}/terraform-provider-docker_${DOCKER_PROVIDER_VERSION}_linux_amd64.zip
-ARG KUBERNETES_PROVIDER_VERSION=2.36.0
-RUN echo "Adding kubernetes/kubernetes v${KUBERNETES_PROVIDER_VERSION}" \
-    && mkdir -p hashicorp/kubernetes && cd hashicorp/kubernetes \
-    && curl -LOs https://releases.hashicorp.com/terraform-provider-kubernetes/${KUBERNETES_PROVIDER_VERSION}/terraform-provider-kubernetes_${KUBERNETES_PROVIDER_VERSION}_linux_amd64.zip
-ARG AWS_PROVIDER_VERSION=5.89.0
-RUN echo "Adding aws/aws v${AWS_PROVIDER_VERSION}" \
-    && mkdir -p aws/aws && cd aws/aws \
-    && curl -LOs https://releases.hashicorp.com/terraform-provider-aws/${AWS_PROVIDER_VERSION}/terraform-provider-aws_${AWS_PROVIDER_VERSION}_linux_amd64.zip
-
-RUN chown -R coder:coder /home/coder/.terraform*
-WORKDIR /home/coder
-
-# Option 2) Use a network mirror.
-#  https://developer.hashicorp.com/terraform/cli/config/config-file#network_mirror
-#  Be sure uncomment line 60 and edit network-mirror-example.tfrc to
-#  specify the HTTPS base URL of your mirror.
-
-# ADD network-mirror-example.tfrc /home/coder/.terraformrc
-
-USER coder
-
-# Use the .terraformrc file to inform Terraform of the locally installed providers.
-ENV TF_CLI_CONFIG_FILE=/home/coder/.terraformrc
+# Environment variables that will be used by entrypoint or code-server
+# PASSWORD will be injected by Hugging Face Secrets
+# PORT is often set by Hugging Face Spaces (defaulting to 7860 if not set)
+ENV PORT=${PORT:-7860}
+ENV DEFAULT_WORKSPACE=/home/coder/project
+ENV USER_DATA_DIR=/home/coder/.local/share/code-server
+ENV EXTENSIONS_DIR=${USER_DATA_DIR}/extensions
+ENV CONFIG_DIR=/home/coder/.config/code-server
+
+# Copy the entrypoint script to a location accessible by the 'coder' user
+# The base image runs as 'coder' user.
+COPY --chown=coder:coder entrypoint.sh /home/coder/entrypoint.sh
+RUN chmod +x /home/coder/entrypoint.sh
+
+# Expose the port code-server will listen on
+EXPOSE ${PORT}
+
+# Set the entrypoint. The script will handle starting code-server.
+ENTRYPOINT ["/home/coder/entrypoint.sh"]
+
+# Default argument to the entrypoint, which can be the workspace to open.
+# The entrypoint script currently hardcodes this, but this is a common pattern.
+CMD ["/home/coder/project"]

Dockerfile.bak

@@ -0,0 +1,25 @@
+FROM codercom/code-server:latest
+
+# Environment variables that will be used by entrypoint or code-server
+# PASSWORD will be injected by Hugging Face Secrets
+# PORT is often set by Hugging Face Spaces (defaulting to 7860 if not set)
+ENV PORT=${PORT:-7860}
+ENV DEFAULT_WORKSPACE=/home/coder/project
+ENV USER_DATA_DIR=/home/coder/.local/share/code-server
+ENV EXTENSIONS_DIR=${USER_DATA_DIR}/extensions
+ENV CONFIG_DIR=/home/coder/.config/code-server
+
+# Copy the entrypoint script to a location accessible by the 'coder' user
+# The base image runs as 'coder' user.
+COPY --chown=coder:coder entrypoint.sh /home/coder/entrypoint.sh
+RUN chmod +x /home/coder/entrypoint.sh
+
+# Expose the port code-server will listen on
+EXPOSE ${PORT}
+
+# Set the entrypoint. The script will handle starting code-server.
+ENTRYPOINT ["/home/coder/entrypoint.sh"]
+
+# Default argument to the entrypoint, which can be the workspace to open.
+# The entrypoint script currently hardcodes this, but this is a common pattern.
+CMD ["/home/coder/project"]

entrypoint.sh

@@ -0,0 +1,74 @@
+#!/bin/bash
+set -e
+
+# Default port, can be overridden by PORT env var from Hugging Face
+APP_PORT=${PORT:-7860}
+
+# Default workspace, can be overridden by args to this script or Docker CMD
+DEFAULT_WORKSPACE_PATH=${1:-/home/coder/project}
+
+# Ensure necessary directories exist and have correct permissions for the 'coder' user
+# These are usually created by the base image, but good to ensure.
+mkdir -p "${DEFAULT_WORKSPACE_PATH}"
+mkdir -p "${USER_DATA_DIR}" # Typically /home/coder/.local/share/code-server
+mkdir -p "${EXTENSIONS_DIR}" # Typically /home/coder/.local/share/code-server/extensions
+mkdir -p "${CONFIG_DIR}" # Typically /home/coder/.config/code-server
+
+# Change ownership to coder user if script is run as root initially (not expected in HF Spaces)
+# However, Hugging Face Spaces usually run as a non-root user that matches the Dockerfile USER.
+# The codercom/code-server image already runs as 'coder' (UID 1000, GID 1000).
+# So, explicit chown might not be strictly necessary here if files are copied with --chown=coder:coder
+# and directories are created by the 'coder' user process.
+
+echo "Ensuring correct ownership for coder user..."
+# Since we are running as coder user (defined in base image), these should already be owned by coder.
+# If not, it means something is wrong with the base image or execution context.
+# We'll skip chown for now as it might fail in restricted environments if not run as root.
+
+# Install extensions if they are not already installed
+# List of extensions to install
+EXTENSIONS_TO_INSTALL=(
+  "ms-python.python"
+  "dbaeumer.vscode-eslint"
+  "ms-ceintl.vscode-language-pack-zh-hans"
+  "rooveterinaryinc.roo-cline"
+)
+
+INSTALLED_EXTENSIONS_LIST=$(code-server --list-extensions --extensions-dir "${EXTENSIONS_DIR}")
+
+for EXTENSION_ID in "${EXTENSIONS_TO_INSTALL[@]}"; do
+  if echo "${INSTALLED_EXTENSIONS_LIST}" | grep -qi "${EXTENSION_ID}"; then
+    echo "Extension ${EXTENSION_ID} is already installed."
+  else
+    echo "Installing extension ${EXTENSION_ID}..."
+    code-server --extensions-dir "${EXTENSIONS_DIR}" --install-extension "${EXTENSION_ID}" || echo "Failed to install extension ${EXTENSION_ID}, continuing..."
+  fi
+done
+
+# Prepare arguments for code-server
+ARGS=(
+  "--bind-addr" "0.0.0.0:${APP_PORT}" 
+  "--user-data-dir" "${USER_DATA_DIR}" 
+  "--extensions-dir" "${EXTENSIONS_DIR}" 
+  "--config" "${CONFIG_DIR}/config.yaml"
+  "--auth" "password" # Use password authentication
+  # "--disable-telemetry" # Optional: disable telemetry
+)
+
+# If PASSWORD environment variable is set (from Hugging Face Secrets), use it.
+# The base image itself will pick up the PASSWORD env var if --auth password is set.
+if [ -n "${PASSWORD}" ]; then
+  echo "Password environment variable is set. code-server will use it."
+else
+  echo "WARNING: PASSWORD environment variable is not set. code-server might start without a password or with a default one if not configured otherwise."
+fi
+
+# The last argument is the workspace directory to open
+ARGS+=("${DEFAULT_WORKSPACE_PATH}")
+
+echo "Starting code-server on port ${APP_PORT} with workspace ${DEFAULT_WORKSPACE_PATH}..."
+
+# Execute code-server with all arguments
+# The PASSWORD env var is automatically picked up by code-server when --auth password is used.
+exec code-server "${ARGS[@]}"
+