22333Misaka commited on
Commit
d48184d
·
verified ·
1 Parent(s): f3a110a

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +3 -7
Dockerfile CHANGED
@@ -13,15 +13,14 @@ WORKDIR /app
13
  # 3. 权限设置
14
  RUN mkdir -p /app/downloads && chmod 777 /app/downloads
15
 
16
- # 4. 创建隔离的 Web 目录 (关键修复)
17
  RUN mkdir -p /app/public && \
18
  echo "SaveAny Bot is Protected & Running" > /app/public/index.html
19
 
20
- # 5. 编写启动脚本
21
  RUN echo '#!/bin/sh' > /app/start.sh && \
22
  echo 'echo "--- 🔒 Starting Secure Wrapper ---"' >> /app/start.sh && \
23
  echo '' >> /app/start.sh && \
24
- # --- 步骤A: 下载配置文件 (存放在 /app/config.toml) ---
25
  echo 'echo "1. Downloading Config..."' >> /app/start.sh && \
26
  echo 'if [ -n "$CONFIG_URL" ]; then' >> /app/start.sh && \
27
  echo ' curl -L -s -o /app/config.toml "$CONFIG_URL"' >> /app/start.sh && \
@@ -34,15 +33,12 @@ RUN echo '#!/bin/sh' > /app/start.sh && \
34
  echo ' echo "⚠️ CONFIG_URL not set."' >> /app/start.sh && \
35
  echo 'fi' >> /app/start.sh && \
36
  echo '' >> /app/start.sh && \
37
- # --- 步骤B: 启动 Web Server (限制在 /app/public 目录) ---
38
  echo 'echo "2. Starting Isolated Web Server..."' >> /app/start.sh && \
39
- # 进入 public 目录启动 web server,这样它就看不见上一级的 config.toml 了
40
  echo 'cd /app/public' >> /app/start.sh && \
41
  echo 'nohup python3 -m http.server 7860 > /dev/null 2>&1 &' >> /app/start.sh && \
42
- echo 'cd /app' >> /app/start.sh && \ # 切回 /app 准备启动 bot
43
  echo 'sleep 2' >> /app/start.sh && \
44
  echo '' >> /app/start.sh && \
45
- # --- 步骤C: 启动 Bot ---
46
  echo 'echo "3. Starting Bot..."' >> /app/start.sh && \
47
  echo './saveany-bot' >> /app/start.sh && \
48
  chmod +x /app/start.sh
 
13
  # 3. 权限设置
14
  RUN mkdir -p /app/downloads && chmod 777 /app/downloads
15
 
16
+ # 4. 创建隔离的 Web 目录
17
  RUN mkdir -p /app/public && \
18
  echo "SaveAny Bot is Protected & Running" > /app/public/index.html
19
 
20
+ # 5. 编写启动脚本 (已移除所有导致报错的注释)
21
  RUN echo '#!/bin/sh' > /app/start.sh && \
22
  echo 'echo "--- 🔒 Starting Secure Wrapper ---"' >> /app/start.sh && \
23
  echo '' >> /app/start.sh && \
 
24
  echo 'echo "1. Downloading Config..."' >> /app/start.sh && \
25
  echo 'if [ -n "$CONFIG_URL" ]; then' >> /app/start.sh && \
26
  echo ' curl -L -s -o /app/config.toml "$CONFIG_URL"' >> /app/start.sh && \
 
33
  echo ' echo "⚠️ CONFIG_URL not set."' >> /app/start.sh && \
34
  echo 'fi' >> /app/start.sh && \
35
  echo '' >> /app/start.sh && \
 
36
  echo 'echo "2. Starting Isolated Web Server..."' >> /app/start.sh && \
 
37
  echo 'cd /app/public' >> /app/start.sh && \
38
  echo 'nohup python3 -m http.server 7860 > /dev/null 2>&1 &' >> /app/start.sh && \
39
+ echo 'cd /app' >> /app/start.sh && \
40
  echo 'sleep 2' >> /app/start.sh && \
41
  echo '' >> /app/start.sh && \
 
42
  echo 'echo "3. Starting Bot..."' >> /app/start.sh && \
43
  echo './saveany-bot' >> /app/start.sh && \
44
  chmod +x /app/start.sh