Update Dockerfile
Browse files- Dockerfile +8 -10
Dockerfile
CHANGED
@@ -14,20 +14,22 @@ RUN pip install --no-cache-dir -r requirements.txt
|
|
14 |
|
15 |
# 下载并配置 subconverter (使用更可靠的发布版本)
|
16 |
RUN mkdir -p /app/subconverter && \
|
|
|
17 |
cd /app && \
|
18 |
wget https://github.com/tindy2013/subconverter/releases/download/v0.7.2/subconverter_linux64.tar.gz && \
|
19 |
tar -xzf subconverter_linux64.tar.gz && \
|
20 |
rm subconverter_linux64.tar.gz && \
|
21 |
-
chmod
|
|
|
22 |
|
23 |
# 复制应用文件
|
24 |
COPY . .
|
25 |
|
26 |
-
# 创建更可靠的启动脚本
|
27 |
RUN echo '#!/bin/bash\n\
|
28 |
# 启动 subconverter 并等待\n\
|
29 |
cd /app/subconverter\n\
|
30 |
-
./subconverter >/
|
31 |
SUBCONVERTER_PID=$!\n\
|
32 |
\n\
|
33 |
echo "等待 subconverter 启动..."\n\
|
@@ -37,14 +39,10 @@ sleep 8\n\
|
|
37 |
# 检查 subconverter 是否正在运行\n\
|
38 |
if ps -p $SUBCONVERTER_PID > /dev/null; then\n\
|
39 |
echo "subconverter 成功启动 (PID: $SUBCONVERTER_PID)"\n\
|
40 |
-
#
|
41 |
-
curl -s http://127.0.0.1:25500/version
|
42 |
-
echo "版本信息: $(cat /app/version.txt)"\n\
|
43 |
else\n\
|
44 |
-
echo "subconverter
|
45 |
-
# 打印日志以供调试\n\
|
46 |
-
echo "=== subconverter 日志 ===" \n\
|
47 |
-
cat /app/subconverter.log\n\
|
48 |
fi\n\
|
49 |
\n\
|
50 |
# 启动 Flask 应用\n\
|
|
|
14 |
|
15 |
# 下载并配置 subconverter (使用更可靠的发布版本)
|
16 |
RUN mkdir -p /app/subconverter && \
|
17 |
+
mkdir -p /app/logs && \
|
18 |
cd /app && \
|
19 |
wget https://github.com/tindy2013/subconverter/releases/download/v0.7.2/subconverter_linux64.tar.gz && \
|
20 |
tar -xzf subconverter_linux64.tar.gz && \
|
21 |
rm subconverter_linux64.tar.gz && \
|
22 |
+
chmod -R 755 /app/subconverter && \
|
23 |
+
chmod -R 777 /app/logs
|
24 |
|
25 |
# 复制应用文件
|
26 |
COPY . .
|
27 |
|
28 |
+
# 创建更可靠的启动脚本 - 无需日志文件写入
|
29 |
RUN echo '#!/bin/bash\n\
|
30 |
# 启动 subconverter 并等待\n\
|
31 |
cd /app/subconverter\n\
|
32 |
+
./subconverter >/dev/null 2>&1 &\n\
|
33 |
SUBCONVERTER_PID=$!\n\
|
34 |
\n\
|
35 |
echo "等待 subconverter 启动..."\n\
|
|
|
39 |
# 检查 subconverter 是否正在运行\n\
|
40 |
if ps -p $SUBCONVERTER_PID > /dev/null; then\n\
|
41 |
echo "subconverter 成功启动 (PID: $SUBCONVERTER_PID)"\n\
|
42 |
+
# 尝试获取版本信息 \n\
|
43 |
+
curl -s http://127.0.0.1:25500/version || echo "无法获取版本信息,但进程已启动"\n\
|
|
|
44 |
else\n\
|
45 |
+
echo "subconverter 启动失败,切换到代理模式"\n\
|
|
|
|
|
|
|
46 |
fi\n\
|
47 |
\n\
|
48 |
# 启动 Flask 应用\n\
|