Update Dockerfile
Browse files- Dockerfile +41 -62
Dockerfile
CHANGED
|
@@ -4,76 +4,55 @@ WORKDIR /opt/openlist
|
|
| 4 |
USER root
|
| 5 |
EXPOSE 5244
|
| 6 |
|
| 7 |
-
#
|
| 8 |
RUN chmod +x ./openlist
|
| 9 |
|
| 10 |
-
|
| 11 |
-
|
| 12 |
-
echo
|
| 13 |
-
|
| 14 |
-
|
| 15 |
-
\
|
| 16 |
-
|
| 17 |
-
|
| 18 |
-
|
| 19 |
-
|
| 20 |
-
|
| 21 |
-
|
| 22 |
-
|
| 23 |
-
|
| 24 |
-
|
| 25 |
-
|
| 26 |
-
|
| 27 |
-
|
| 28 |
-
|
| 29 |
-
|
| 30 |
-
echo '======= 📋 打印启动日志最后 20 行 ======='; \
|
| 31 |
-
tail -n 20 openlist_init.log; \
|
| 32 |
-
exit 1; \
|
| 33 |
fi; \
|
| 34 |
done; \
|
| 35 |
\
|
| 36 |
-
echo '✅
|
| 37 |
-
\
|
| 38 |
-
# 3. 密码校验
|
| 39 |
-
if [ -z \"\$OPENLIST_ADMIN_PASSWORD\" ]; then \
|
| 40 |
-
echo '❌ 错误: Secrets 中未配置 OPENLIST_ADMIN_PASSWORD'; \
|
| 41 |
-
kill \$PID; exit 1; \
|
| 42 |
-
fi; \
|
| 43 |
-
\
|
| 44 |
-
# 4. 获取 Token
|
| 45 |
-
echo '🔑 正在请求管理员 Token...'; \
|
| 46 |
-
RAW_TOKEN=\$(wget -qO- --post-data=\"{\\\"username\\\":\\\"admin\\\",\\\"password\\\":\\\"\$OPENLIST_ADMIN_PASSWORD\\\"}\" \
|
| 47 |
-
--header='Content-Type: application/json' \
|
| 48 |
-
http://127.0.0.1:5244/api/auth/login); \
|
| 49 |
-
\
|
| 50 |
-
TOKEN=\$(echo \$RAW_TOKEN | grep -o '\"token\":\"[^\"]*\"' | cut -d'\"' -f4); \
|
| 51 |
\
|
| 52 |
-
#
|
| 53 |
-
if [ -n \"
|
| 54 |
-
echo '
|
| 55 |
-
|
| 56 |
-
for i in 1 2 3 4 5 6 7 8 9 10; do \
|
| 57 |
-
eval JSON=\\\$STORAGE_JSON_\$i; \
|
| 58 |
-
if [ -z \"\$JSON\" ]; then continue; fi; \
|
| 59 |
-
\
|
| 60 |
-
FOUND_VALID=1; \
|
| 61 |
-
echo \"📦 正在推送第 \$i 个配置...\"; \
|
| 62 |
-
RES=\$(wget -qO- --post-data=\"\$JSON\" \
|
| 63 |
-
--header=\"Content-Type: application/json\" \
|
| 64 |
-
--header=\"Authorization: \$TOKEN\" \
|
| 65 |
-
http://127.0.0.1:5244/api/admin/storage/create); \
|
| 66 |
-
echo \"服务器响应: \$RES\"; \
|
| 67 |
-
done; \
|
| 68 |
\
|
| 69 |
-
if [ \"
|
| 70 |
-
echo '
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 71 |
fi; \
|
| 72 |
-
echo '✨ 所有注入流程执行完毕,切换到主进程日志输出。'; \
|
| 73 |
else \
|
| 74 |
-
echo '
|
| 75 |
-
echo \"原始响应: \$RAW_TOKEN\"; \
|
| 76 |
fi; \
|
| 77 |
\
|
| 78 |
-
|
| 79 |
-
wait
|
|
|
|
| 4 |
USER root
|
| 5 |
EXPOSE 5244
|
| 6 |
|
| 7 |
+
# 确保二进制文件具备执行权限
|
| 8 |
RUN chmod +x ./openlist
|
| 9 |
|
| 10 |
+
# 使用真正的 Shell 脚本模式,减少 sh -c 的转义地狱
|
| 11 |
+
CMD ["sh", "-c", "\
|
| 12 |
+
echo '--- [1/4] 环境自检 ---'; \
|
| 13 |
+
ls -l ./openlist; \
|
| 14 |
+
\
|
| 15 |
+
echo '--- [2/4] 启动主服务 ---'; \
|
| 16 |
+
./openlist server & \
|
| 17 |
+
PID=$!; \
|
| 18 |
+
\
|
| 19 |
+
echo '--- [3/4] 端口存活探测 ---'; \
|
| 20 |
+
# 这里的循环不带 -q,让你能看到 wget 的实时输出
|
| 21 |
+
MAX_RETRIES=20; \
|
| 22 |
+
while ! wget --spider -S http://127.0.0.1:5244/api/public/settings 2>&1 | grep 'HTTP/1.1 200 OK'; do \
|
| 23 |
+
echo '等待 5244 端口响应...'; \
|
| 24 |
+
sleep 2; \
|
| 25 |
+
MAX_RETRIES=$((MAX_RETRIES - 1)); \
|
| 26 |
+
if [ $MAX_RETRIES -le 0 ]; then \
|
| 27 |
+
echo '❌ 探测超时,请检查服务是否崩溃'; \
|
| 28 |
+
ps aux; \
|
| 29 |
+
kill $PID; exit 1; \
|
|
|
|
|
|
|
|
|
|
| 30 |
fi; \
|
| 31 |
done; \
|
| 32 |
\
|
| 33 |
+
echo '✅ 服务已就绪,开始执行注入逻辑...'; \
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 34 |
\
|
| 35 |
+
# 这里的注入逻辑做了极简化处理,防止因为 JSON 格式导致脚本断流
|
| 36 |
+
if [ -n \"$OPENLIST_ADMIN_PASSWORD\" ]; then \
|
| 37 |
+
echo '🔑 正在登录获取 Token...'; \
|
| 38 |
+
TOKEN=$(wget -qO- --post-data=\"{\\\"username\\\":\\\"admin\\\",\\\"password\\\":\\\"$OPENLIST_ADMIN_PASSWORD\\\"}\" --header='Content-Type: application/json' http://127.0.0.1:5244/api/auth/login | grep -o '\"token\":\"[^\"]*\"' | cut -d'\"' -f4); \
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 39 |
\
|
| 40 |
+
if [ -n \"$TOKEN\" ]; then \
|
| 41 |
+
echo '🚀 登录成功,开始处理存储配置...'; \
|
| 42 |
+
for i in $(seq 1 10); do \
|
| 43 |
+
eval JSON=\$STORAGE_JSON_$i; \
|
| 44 |
+
if [ -n \"$JSON\" ]; then \
|
| 45 |
+
echo \"推送配置 STORAGE_JSON_$i...\"; \
|
| 46 |
+
wget -qO- --post-data=\"$JSON\" --header='Content-Type: application/json' --header=\"Authorization: $TOKEN\" http://127.0.0.1:5244/api/admin/storage/create; \
|
| 47 |
+
echo ''; \
|
| 48 |
+
fi; \
|
| 49 |
+
done; \
|
| 50 |
+
else \
|
| 51 |
+
echo '⚠️ 登录失败,无法注入配置,请检查密码。'; \
|
| 52 |
fi; \
|
|
|
|
| 53 |
else \
|
| 54 |
+
echo 'ℹ️ 未发现 ADMIN_PASSWORD,跳过自动配置。'; \
|
|
|
|
| 55 |
fi; \
|
| 56 |
\
|
| 57 |
+
echo '--- [4/4] 流程结束,进入日志监听模式 ---'; \
|
| 58 |
+
wait $PID"]
|