Upload 18 files

Dockerfile

@@ -114,17 +114,14 @@ COPY app/ ./app/
 
 # 复制启动脚本并赋予执行权限
 COPY entrypoint.sh ./
-
-# 确保脚本使用 Unix 换行符 (LF) 并设置执行权限
-RUN sed -i 's/\r$//' ./entrypoint.sh && \
-    chmod +x ./entrypoint.sh
+RUN chmod +x ./entrypoint.sh
 
 # 给脚本和二进制文件执行权限 (重复的chmod可能不需要，但在构建阶段设置更安全)
-# RUN chmod +x ./clash_core/clash.meta-linux-amd64 || true
-# RUN chmod +x ./subconverter/subconverter || true
+RUN chmod +x ./clash_core/clash.meta-linux-amd64 || true
+RUN chmod +x ./subconverter/subconverter || true
 
 # 暴露端口
 EXPOSE $FLASK_PORT $CLASH_PROXY_PORT $CLASH_API_PORT
 
-# 使用entrypoint脚本启动应用 (明确指定解释器)
-ENTRYPOINT ["/bin/bash", "/app/entrypoint.sh"] 
+# 使用entrypoint脚本启动应用
+ENTRYPOINT ["/app/entrypoint.sh"] 

entrypoint.sh

@@ -1,11 +1,6 @@
-#!/bin/bash
-
-# Exit immediately if a command exits with a non-zero status.
-# set -e 
-# ^^^ We keep this commented out to allow warnings for non-critical errors like chmod
-
-# Enable xtrace to print commands and their arguments as they are executed.
-set -x
+#!/bin/sh
+# 不再使用set -e，避免因chmod失败而中止脚本
+# set -e
 
 # 设置颜色输出
 RED='\033[0;31m'
@@ -13,111 +8,94 @@ GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
 NC='\033[0m' # No Color
 
-echo_color() {
-    local color_code="$1"
-    shift
-    echo -e "\033[${color_code}m$@\033[0m"
-}
-
-echo_info() {
-    echo_color "0;32" "INFO: $@"
-}
-echo_warning() {
-    echo_color "1;33" "WARN: $@"
-}
-echo_error() {
-    echo_color "0;31" "ERROR: $@"
-}
-
-echo "\n===== Application Startup at $(date '+%Y-%m-%d %H:%M:%S') =====\n"
-
-echo_info "Starting Simple Clash Relay..."
+echo "${GREEN}Starting Simple Clash Relay...${NC}"
 
-# Display system information
-echo_color "1;33" "System information:"
+# 添加诊断信息
+echo "${YELLOW}System information:${NC}"
 uname -a
-echo_color "1;33" "Running as user:"
+echo "${YELLOW}Running as user:${NC}"
 id
 
-echo_info "Checking environment variables..."
-# Print key environment variables (mask sensitive ones if necessary in real logs)
-printenv | grep -E 'FLASK_PORT|CLASH_PROXY_PORT|CLASH_API_PORT|SUB_URL|API_KEY|PORT|TZ' || echo "No relevant env vars found or grep failed."
-
-# Check for critical env vars
-if [ -z "$SUB_URL" ]; then
-    echo_warning "SUB_URL environment variable is not set! Subscription download will likely fail."
-fi
-if [ -z "$API_KEY" ]; then
-    echo_warning "API_KEY environment variable is not set. Using default 'changeme' (insecure)."
-fi
-
-DATA_DIR="/app/data"
-echo_info "Ensuring data directory exists: ${DATA_DIR}"
-mkdir -p "${DATA_DIR}" || echo_warning "Failed to create data directory ${DATA_DIR}"
+echo "${YELLOW}Checking executables:${NC}"
+file /app/clash_core/clash.meta-linux-amd64
+ls -la /app/clash_core/clash.meta-linux-amd64
 
-# Optionally clean config files
+# 可选清理旧配置（如果指定CLEAN_CONFIG=true）
 if [ "${CLEAN_CONFIG}" = "true" ]; then
-    echo_info "CLEAN_CONFIG is true. Removing old config files..."
-    rm -f "${DATA_DIR}/config.yaml" "${DATA_DIR}/config.yaml.raw"
-    echo_info "Old config files removed."
+    echo "${YELLOW}Cleaning old config files...${NC}"
+    rm -f /app/data/config.yaml /app/data/config.yaml.raw
+    echo "${GREEN}Old config files cleaned${NC}"
 fi
 
-# Check necessary executables and set permissions
-CLASH_CORE_PATH="/app/clash_core/clash.meta-linux-amd64"
-SUBCONVERTER_PATH="/app/subconverter/subconverter"
-
-echo_info "Checking executables and setting permissions..."
-ls -la "${CLASH_CORE_PATH}" || echo_warning "Clash core not found at ${CLASH_CORE_PATH}"
-ls -la "${SUBCONVERTER_PATH}" || echo_warning "Subconverter not found at ${SUBCONVERTER_PATH}"
-
-# Attempt to set executable permissions, warn on failure
-chmod +x "${CLASH_CORE_PATH}" || echo_warning "Failed to set executable permission for Clash Meta."
-chmod +x "${SUBCONVERTER_PATH}" || echo_warning "Failed to set executable permission for subconverter."
+# 确保数据目录存在
+mkdir -p /app/data || echo "${YELLOW}Warning: Failed to create /app/data directory${NC}"
 
-# Check file types
-echo_info "Checking file types..."
-file "${CLASH_CORE_PATH}" || echo_warning "Failed to check file type for Clash Meta."
-file "${SUBCONVERTER_PATH}" || echo_warning "Failed to check file type for subconverter."
+# 尝试设置权限，但允许失败
+chmod -R 777 /app/data 2>/dev/null || echo "${YELLOW}Warning: Failed to set permissions for /app/data, continuing anyway${NC}"
 
-# Check if Clash core exists and seems valid
-if [ -f "${CLASH_CORE_PATH}" ]; then
-    echo_info "Clash Meta found at ${CLASH_CORE_PATH}"
-else
-    echo_error "Clash Meta executable not found at ${CLASH_CORE_PATH}! Cannot start Clash."
-    # Optionally exit here if Clash core is absolutely required
-    # exit 1 
+# 尝试设置subconverter执行权限，但允许失败
+if [ -f "/app/subconverter/subconverter" ]; then
+    chmod +x /app/subconverter/subconverter 2>/dev/null || echo "${YELLOW}Warning: Failed to set executable permission for subconverter${NC}"
 fi
 
-# Check if subconverter exists and seems valid
-if [ -f "${SUBCONVERTER_PATH}" ]; then
-    echo_info "Subconverter found at ${SUBCONVERTER_PATH}"
+# 尝试设置Clash Core执行权限，但允许失败
+if [ -f "/app/clash_core/clash.meta-linux-amd64" ]; then
+    chmod +x /app/clash_core/clash.meta-linux-amd64 2>/dev/null || echo "${YELLOW}Warning: Failed to set executable permission for Clash Meta${NC}"
+    echo "${GREEN}Clash Meta found${NC}"
 else
-    echo_warning "Subconverter executable not found at ${SUBCONVERTER_PATH}. Conversion might fail if needed."
+    echo "${RED}Error: Clash Core executable not found!${NC}"
+    exit 1
 fi
 
-# --- Launch Application ---
-FLASK_PORT=${PORT:-7860} # Use PORT env var if set (common in PaaS), otherwise default
-WORKERS=${WORKERS:-4} # Default to 4 workers, allow override via env var
+# 加载环境变量
+if [ -f ".env" ]; then
+    echo "${GREEN}Loading environment variables from .env file...${NC}"
+    export $(grep -v '^#' .env | xargs -d '\n')
+fi
 
-echo_info "Preparing to launch Flask application on port ${FLASK_PORT} with ${WORKERS} workers..."
+# 检查必要的环境变量
+if [ -z "$SUB_URL" ]; then
+    echo "${RED}Error: SUB_URL environment variable is not set!${NC}"
+    exit 1
+fi
 
-# Navigate to the app directory just in case
-cd /app || { echo_error "Failed to cd into /app directory!"; exit 1; }
+# 设置默认端口
+export FLASK_PORT=${FLASK_PORT:-7860}
+echo "${GREEN}Flask will listen on port ${FLASK_PORT}${NC}"
+
+# 输出基本信息
+echo "=========================="
+echo "  Simple Clash Relay"
+echo "=========================="
+echo "Starting services..."
+
+# 打印环境变量（隐藏敏感信息）
+echo "Environment:"
+echo "FLASK_PORT:        ${FLASK_PORT:-7860}"
+echo "CLASH_PROXY_PORT:  ${CLASH_PROXY_PORT:-7890}"
+echo "CLASH_API_PORT:    ${CLASH_API_PORT:-9090}"
+echo "SUB_URL:           [hidden]"
+echo "API_KEY:           [hidden]"
+
+# 检查必要的环境变量
+if [ -z "$API_KEY" ]; then
+    echo "WARNING: API_KEY is not set. Using default value (insecure)!"
+    export API_KEY="changeme"
+fi
 
-echo_info "Current directory: $(pwd)"
-echo_info "Listing contents of /app:"
-ls -la
+# 启动Flask应用
+echo "${GREEN}Starting Flask application...${NC}"
 
-echo_info "Launching Gunicorn..."
+# 使用gunicorn启动Flask应用（生产环境推荐）
+# 如果WORKER_COUNT未设置，使用CPU核心数+1的worker数量
+WORKER_COUNT=${WORKER_COUNT:-$(( $(nproc) + 1 ))}
+echo "Using $WORKER_COUNT workers"
 
-# Execute Gunicorn
+# 确保所有参数在一行或使用清晰的续行符
 exec gunicorn \
-    --workers ${WORKERS} \
-    --bind 0.0.0.0:${FLASK_PORT} \
+    --workers $WORKER_COUNT \
+    --bind 0.0.0.0:${FLASK_PORT:-7860} \
     --log-level info \
-    --access-logfile '-' \
-    --error-logfile '-' \
-    app.main:app
-
-# If exec fails, this part will be reached
-echo_error "Failed to execute Gunicorn!" 
+    --access-logfile - \
+    --error-logfile - \
+    app.main:app