Update Dockerfile
Browse files- Dockerfile +34 -71
Dockerfile
CHANGED
|
@@ -3,91 +3,54 @@ WORKDIR /opt/openlist
|
|
| 3 |
USER root
|
| 4 |
EXPOSE 5244
|
| 5 |
|
| 6 |
-
# 1.
|
| 7 |
ENTRYPOINT []
|
| 8 |
-
|
| 9 |
-
# 2. 赋予执行权限
|
| 10 |
RUN chmod +x ./openlist
|
| 11 |
|
| 12 |
-
#
|
| 13 |
-
CMD
|
| 14 |
-
# 强制让 stdout 变为行缓冲模式,防止日志积压
|
| 15 |
-
stty -F /dev/stderr sane 2>/dev/null; \
|
| 16 |
-
\
|
| 17 |
-
# 1. 启动服务
|
| 18 |
-
./openlist server & \
|
| 19 |
PID=$!; \
|
|
|
|
|
|
|
| 20 |
\
|
| 21 |
-
#
|
| 22 |
-
|
| 23 |
-
echo ''; \
|
| 24 |
-
sleep 5; \
|
| 25 |
-
\
|
| 26 |
-
MAX_RETRIES=10; \
|
| 27 |
while ! wget -q --spider http://127.0.0.1:5244/api/public/settings; do \
|
| 28 |
-
echo
|
| 29 |
-
sleep
|
| 30 |
MAX_RETRIES=$((MAX_RETRIES - 1)); \
|
| 31 |
if [ $MAX_RETRIES -le 0 ]; then \
|
| 32 |
-
echo
|
| 33 |
-
|
| 34 |
-
exit 1; \
|
| 35 |
fi; \
|
| 36 |
done; \
|
| 37 |
\
|
| 38 |
-
echo
|
| 39 |
-
echo '✅ 服务已就绪!'; \
|
| 40 |
-
echo ''; \
|
| 41 |
-
\
|
| 42 |
-
# 3. 环境变量校验
|
| 43 |
-
if [ -z \"$OPENLIST_ADMIN_PASSWORD\" ]; then \
|
| 44 |
-
echo '❌ 错误: 未检测到 OPENLIST_ADMIN_PASSWORD。'; \
|
| 45 |
-
wait $PID; exit 1; \
|
| 46 |
-
fi; \
|
| 47 |
-
\
|
| 48 |
-
# 4. 获取 Token
|
| 49 |
-
echo '🔑 正在获取 Token...'; \
|
| 50 |
-
RAW_TOKEN=$(wget -qO- --timeout=5 --post-data=\"{\\\"username\\\":\\\"admin\\\",\\\"password\\\":\\\"$OPENLIST_ADMIN_PASSWORD\\\"}\" \
|
| 51 |
-
--header='Content-Type: application/json' \
|
| 52 |
-
http://127.0.0.1:5244/api/auth/login); \
|
| 53 |
\
|
| 54 |
-
|
| 55 |
-
|
| 56 |
-
|
| 57 |
-
|
| 58 |
-
|
| 59 |
-
echo ''; \
|
| 60 |
-
FOUND_VALID=0; \
|
| 61 |
-
for i in 1 2 3 4 5 6 7 8 9 10; do \
|
| 62 |
-
eval JSON=\\\$STORAGE_JSON_$i; \
|
| 63 |
-
\
|
| 64 |
-
if [ -z \"$JSON\" ]; then \
|
| 65 |
-
continue; \
|
| 66 |
-
fi; \
|
| 67 |
-
\
|
| 68 |
-
FOUND_VALID=1; \
|
| 69 |
-
if echo \"$JSON\" | grep -qv '\"mount_path\"'; then \
|
| 70 |
-
echo \"⚠️ 错误: STORAGE_JSON_$i 格式错误,已跳过。\"; \
|
| 71 |
-
continue; \
|
| 72 |
-
fi; \
|
| 73 |
-
\
|
| 74 |
-
echo \"📦 正在添加第 $i 个存储配置...\"; \
|
| 75 |
-
RES=$(wget -qO- --timeout=5 --post-data=\"$JSON\" \
|
| 76 |
-
--header=\"Content-Type: application/json\" \
|
| 77 |
-
--header=\"Authorization: $TOKEN\" \
|
| 78 |
-
http://127.0.0.1:5244/api/admin/storage/create); \
|
| 79 |
-
echo \"$RES\"; \
|
| 80 |
-
echo ''; \
|
| 81 |
-
done; \
|
| 82 |
\
|
| 83 |
-
if [
|
| 84 |
-
echo
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 85 |
fi; \
|
| 86 |
-
echo '✅ 所有存储处理完成!'; \
|
| 87 |
else \
|
| 88 |
-
echo
|
| 89 |
-
echo \"💡 响应内容: ${RAW_TOKEN:-'请求超时'}\"; \
|
| 90 |
fi; \
|
| 91 |
\
|
| 92 |
-
|
| 93 |
-
wait $PID
|
|
|
|
| 3 |
USER root
|
| 4 |
EXPOSE 5244
|
| 5 |
|
| 6 |
+
# 1. 强行重置入口点(这是解决所有诡异启动问题的钥匙)
|
| 7 |
ENTRYPOINT []
|
|
|
|
|
|
|
| 8 |
RUN chmod +x ./openlist
|
| 9 |
|
| 10 |
+
# 2. 纯字符串模式 CMD,避免解析器把 ["sh", "-c"] 认错
|
| 11 |
+
CMD ./openlist server & \
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 12 |
PID=$!; \
|
| 13 |
+
echo "⏳ 正在等待 OpenList 服务启动..."; \
|
| 14 |
+
sleep 10; \
|
| 15 |
\
|
| 16 |
+
# 增加更稳健的探测
|
| 17 |
+
MAX_RETRIES=15; \
|
|
|
|
|
|
|
|
|
|
|
|
|
| 18 |
while ! wget -q --spider http://127.0.0.1:5244/api/public/settings; do \
|
| 19 |
+
echo "探测中... (剩余重试: $MAX_RETRIES)"; \
|
| 20 |
+
sleep 3; \
|
| 21 |
MAX_RETRIES=$((MAX_RETRIES - 1)); \
|
| 22 |
if [ $MAX_RETRIES -le 0 ]; then \
|
| 23 |
+
echo "❌ 服务启动超时!"; \
|
| 24 |
+
ps aux; exit 1; \
|
|
|
|
| 25 |
fi; \
|
| 26 |
done; \
|
| 27 |
\
|
| 28 |
+
echo "✅ 服务已就绪,正在获取 Token..."; \
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 29 |
\
|
| 30 |
+
if [ -n "$OPENLIST_ADMIN_PASSWORD" ]; then \
|
| 31 |
+
RAW_TOKEN=$(wget -qO- --timeout=10 --post-data="{\"username\":\"admin\",\"password\":\"$OPENLIST_ADMIN_PASSWORD\"}" \
|
| 32 |
+
--header='Content-Type: application/json' \
|
| 33 |
+
http://127.0.0.1:5244/api/auth/login); \
|
| 34 |
+
\
|
| 35 |
+
TOKEN=$(echo $RAW_TOKEN | grep -o '"token":"[^"]*"' | cut -d'"' -f4); \
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 36 |
\
|
| 37 |
+
if [ -n "$TOKEN" ]; then \
|
| 38 |
+
echo "🚀 登录成功,开始注入配置..."; \
|
| 39 |
+
for i in 1 2 3 4 5 6 7 8 9 10; do \
|
| 40 |
+
eval JSON=\$STORAGE_JSON_$i; \
|
| 41 |
+
if [ -n "$JSON" ]; then \
|
| 42 |
+
echo "推送配置 STORAGE_JSON_$i..."; \
|
| 43 |
+
wget -qO- --post-data="$JSON" --header='Content-Type: application/json' --header="Authorization: $TOKEN" http://127.0.0.1:5244/api/admin/storage/create; \
|
| 44 |
+
echo ""; \
|
| 45 |
+
fi; \
|
| 46 |
+
done; \
|
| 47 |
+
echo "✅ 所有存储处理完成!"; \
|
| 48 |
+
else \
|
| 49 |
+
echo "❌ 登录失败,响应内容: $RAW_TOKEN"; \
|
| 50 |
fi; \
|
|
|
|
| 51 |
else \
|
| 52 |
+
echo "⚠️ 未发现 ADMIN_PASSWORD,跳过自动配置。"; \
|
|
|
|
| 53 |
fi; \
|
| 54 |
\
|
| 55 |
+
echo "--- 主进程守护中 ---"; \
|
| 56 |
+
wait $PID
|