Upload 5 files

Dockerfile

@@ -5,7 +5,6 @@ ENV RUNTIME_DIR=/tmp/cliproxyapi
 ENV SUPERVISOR_CONF=/etc/supervisord.conf
 ENV UPDATE_INTERVAL_SECONDS=14400
 ENV STOP_WAIT_SECS=60
-ENV SUPERVISORD_MINFDS=4096
 
 RUN apk add --no-cache ca-certificates curl supervisor tzdata \
     && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \

entrypoint.sh

@@ -1,18 +1,15 @@
 #!/bin/sh
 set -eu
 
-: "${RUNTIME_DIR:=/tmp/cliproxyapi}"
-: "${SUPERVISOR_CONF:=/etc/supervisord.conf}"
 : "${RELEASE_COMMON_SH:=/usr/local/bin/release-common.sh}"
 : "${SUPERVISORD_BIN:=/usr/bin/supervisord}"
+: "${OPEN_FILE_LIMIT:=65535}"
 
 . "$RELEASE_COMMON_SH"
 
 export RUNTIME_DIR
 export SUPERVISOR_CONF
 
-ulimit -n 65535
-
 shell_quote() {
   printf "'%s'" "$(printf '%s' "$1" | sed "s/'/'\"'\"'/g")"
 }
@@ -33,14 +30,28 @@ write_run_app_script() {
   chmod +x "$run_app_script"
 }
 
-ensure_runtime_dirs
-rm -f "$RUNTIME_DIR/supervisor.sock" "$RUNTIME_DIR/supervisord.pid"
+prepare_runtime_environment() {
+  ulimit -n "$OPEN_FILE_LIMIT"
+  ensure_runtime_dirs
+  rm -f "$RUNTIME_DIR/supervisor.sock" "$RUNTIME_DIR/supervisord.pid"
+}
+
+bootstrap_release_or_exit() {
+  if ! ensure_initial_release; then
+    echo "错误: 初次启动时无法准备可运行版本" >&2
+    exit 1
+  fi
+}
 
-if ! ensure_initial_release; then
-  echo "错误: 初次启动时无法准备可运行版本" >&2
-  exit 1
-fi
+start_supervisord() {
+  exec "$SUPERVISORD_BIN" -c "$SUPERVISOR_CONF"
+}
 
-write_run_app_script "$@"
+main() {
+  prepare_runtime_environment
+  bootstrap_release_or_exit
+  write_run_app_script "$@"
+  start_supervisord
+}
 
-exec "$SUPERVISORD_BIN" -c "$SUPERVISOR_CONF"
+main "$@"

scripts/release-common.sh

@@ -12,7 +12,16 @@
 : "${APP_BINARY_NAMES:=cli-proxy-api CLIProxyAPI}"
 
 log() {
-  printf '%s\n' "$*" >&2
+  timestamp=$(date '+%Y-%m-%d %H:%M:%S %z')
+  printf '[%s] %s\n' "$timestamp" "$*" >&2
+}
+
+tag_to_dir_name() {
+  printf '%s\n' "$1" | tr '/:' '__'
+}
+
+release_dir_for_tag() {
+  printf '%s/%s\n' "$RELEASES_DIR" "$(tag_to_dir_name "$1")"
 }
 
 ensure_runtime_dirs() {
@@ -30,19 +39,22 @@ current_binary_path() {
 }
 
 fetch_latest_release_info() {
-  response=$(curl -fsSL "$REPO_API_URL")
+  response=$(curl -fsSL "$REPO_API_URL") || return 1
+
   tag_name=$(
     printf '%s\n' "$response" \
       | grep -Eo '"tag_name"[[:space:]]*:[[:space:]]*"[^"]+"' \
       | head -n 1 \
-      | cut -d '"' -f 4
+      | cut -d '"' -f 4 \
+      || true
   )
   asset_url=$(
     printf '%s\n' "$response" \
       | grep -Eo '"browser_download_url"[[:space:]]*:[[:space:]]*"[^"]*"' \
       | cut -d '"' -f 4 \
       | grep -E '/[^/]*linux[-_]amd64(\.tar\.gz)?$' \
-      | head -n 1
+      | head -n 1 \
+      || true
   )
 
   if [ -z "$tag_name" ] || [ -z "$asset_url" ]; then
@@ -52,6 +64,12 @@ fetch_latest_release_info() {
   printf '%s|%s\n' "$tag_name" "$asset_url"
 }
 
+load_latest_release() {
+  release_info=$(fetch_latest_release_info) || return 1
+  LATEST_TAG=${release_info%%|*}
+  LATEST_ASSET_URL=${release_info#*|}
+}
+
 find_release_binary() {
   release_dir=$1
 
@@ -89,12 +107,19 @@ extract_release_binary() {
   chmod +x "$target_path"
 }
 
+cleanup_workspace() {
+  workspace=$1
+  if [ -n "$workspace" ] && [ -d "$workspace" ]; then
+    rm -rf "$workspace"
+  fi
+}
+
 install_release() {
   tag_name=$1
   asset_url=$2
 
   ensure_runtime_dirs
-  release_dir="$RELEASES_DIR/$tag_name"
+  release_dir=$(release_dir_for_tag "$tag_name")
   release_binary="$release_dir/$CURRENT_BINARY_NAME"
 
   if [ -x "$release_binary" ]; then
@@ -102,42 +127,68 @@ install_release() {
     return 0
   fi
 
-  temp_dir=$(mktemp -d "$RUNTIME_DIR/install.XXXXXX")
-  download_path="$DOWNLOADS_DIR/$(basename "$asset_url")"
-  extracted_dir="$temp_dir/release"
+  workspace=$(mktemp -d "$RUNTIME_DIR/install.XXXXXX") || return 1
+  download_name=$(basename "$asset_url")
+  if [ -z "$download_name" ] || [ "$download_name" = "/" ] || [ "$download_name" = "." ]; then
+    download_name="release.asset"
+  fi
+  download_path="$DOWNLOADS_DIR/$download_name"
+  stage_dir="$workspace/stage"
 
-  rm -f "$download_path"
-  mkdir -p "$extracted_dir"
-  curl -fsSL "$asset_url" -o "$download_path"
+  rm -f "$download_path" || {
+    cleanup_workspace "$workspace"
+    return 1
+  }
+  mkdir -p "$stage_dir" || {
+    cleanup_workspace "$workspace"
+    return 1
+  }
+  curl -fsSL "$asset_url" -o "$download_path" || {
+    cleanup_workspace "$workspace"
+    return 1
+  }
 
   case "$download_path" in
     *.tar.gz)
-      tar -xzf "$download_path" -C "$extracted_dir"
-      extract_release_binary "$extracted_dir" "$extracted_dir/$CURRENT_BINARY_NAME" || {
-        rm -rf "$temp_dir"
+      tar -xzf "$download_path" -C "$stage_dir" || {
+        cleanup_workspace "$workspace"
+        return 1
+      }
+      extract_release_binary "$stage_dir" "$stage_dir/$CURRENT_BINARY_NAME" || {
+        cleanup_workspace "$workspace"
         return 1
       }
       ;;
     *)
-      cp "$download_path" "$extracted_dir/$CURRENT_BINARY_NAME"
-      chmod +x "$extracted_dir/$CURRENT_BINARY_NAME"
+      cp "$download_path" "$stage_dir/$CURRENT_BINARY_NAME" || {
+        cleanup_workspace "$workspace"
+        return 1
+      }
+      chmod +x "$stage_dir/$CURRENT_BINARY_NAME" || {
+        cleanup_workspace "$workspace"
+        return 1
+      }
       ;;
   esac
 
-  mkdir -p "$(dirname "$release_dir")"
-  rm -rf "$release_dir"
-  mv "$extracted_dir" "$release_dir"
-  rm -rf "$temp_dir"
+  rm -rf "$release_dir" || {
+    cleanup_workspace "$workspace"
+    return 1
+  }
+  mv "$stage_dir" "$release_dir" || {
+    cleanup_workspace "$workspace"
+    return 1
+  }
+  cleanup_workspace "$workspace"
+
   activate_release "$tag_name" "$release_dir"
 }
 
 ensure_initial_release() {
-  release_info=$(fetch_latest_release_info) || release_info=""
-
-  if [ -n "$release_info" ]; then
-    latest_tag=${release_info%%|*}
-    asset_url=${release_info#*|}
-    install_release "$latest_tag" "$asset_url" && return 0
+  if load_latest_release; then
+    if install_release "$LATEST_TAG" "$LATEST_ASSET_URL"; then
+      return 0
+    fi
     log "警告: 安装最新版本失败，尝试使用已有版本继续启动"
   fi
 
@@ -149,21 +200,20 @@ restart_managed_service() {
 }
 
 update_if_needed() {
-  release_info=$(fetch_latest_release_info) || {
+  load_latest_release || {
     log "检查最新版本失败"
     return 1
   }
-  latest_tag=${release_info%%|*}
-  asset_url=${release_info#*|}
-  installed_tag=$(current_tag)
 
-  if [ "$latest_tag" = "$installed_tag" ]; then
-    log "当前已是最新版本: $latest_tag"
+  installed_tag=$(current_tag)
+  if [ "$LATEST_TAG" = "$installed_tag" ]; then
+    log "当前已是最新版本: $LATEST_TAG"
     return 0
   fi
 
-  install_release "$latest_tag" "$asset_url" || {
-    log "安装新版本失败: $latest_tag"
+  log "发现新版本: ${installed_tag:-<none>} -> $LATEST_TAG"
+  install_release "$LATEST_TAG" "$LATEST_ASSET_URL" || {
+    log "安装新版本失败: $LATEST_TAG"
     return 1
   }
 

scripts/update-loop.sh

@@ -2,11 +2,13 @@
 set -eu
 
 : "${UPDATE_INTERVAL_SECONDS:=14400}"
+: "${RELEASE_COMMON_SH:=/usr/local/bin/release-common.sh}"
 
-. /usr/local/bin/release-common.sh
+. "$RELEASE_COMMON_SH"
 
 while true; do
   sleep "$UPDATE_INTERVAL_SECONDS"
+  log "开始定时版本检查"
   if ! update_if_needed; then
     log "警告: 自动更新检查失败，继续运行当前版本"
   fi