Update Dockerfile
Browse files- Dockerfile +7 -38
Dockerfile
CHANGED
|
@@ -2,56 +2,25 @@ FROM python:3.10-slim
|
|
| 2 |
|
| 3 |
WORKDIR /app
|
| 4 |
|
| 5 |
-
#
|
| 6 |
RUN apt-get update && \
|
| 7 |
-
apt-get install -y
|
| 8 |
apt-get clean && \
|
| 9 |
rm -rf /var/lib/apt/lists/*
|
| 10 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 11 |
# 安装 Python 依赖
|
| 12 |
COPY requirements.txt .
|
| 13 |
RUN pip install --no-cache-dir -r requirements.txt
|
| 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\
|
| 36 |
-
# 等待 subconverter 完成初始化 (通常需要几秒钟)\n\
|
| 37 |
-
sleep 8\n\
|
| 38 |
-
\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\
|
| 49 |
-
cd /app\n\
|
| 50 |
-
exec gunicorn --bind 0.0.0.0:7860 app:app\n\
|
| 51 |
-
' > /app/start.sh && chmod +x /app/start.sh
|
| 52 |
-
|
| 53 |
# 暴露端口
|
| 54 |
EXPOSE 7860
|
| 55 |
|
| 56 |
# 启动命令
|
| 57 |
-
CMD ["
|
|
|
|
| 2 |
|
| 3 |
WORKDIR /app
|
| 4 |
|
| 5 |
+
# 安装基本依赖
|
| 6 |
RUN apt-get update && \
|
| 7 |
+
apt-get install -y curl && \
|
| 8 |
apt-get clean && \
|
| 9 |
rm -rf /var/lib/apt/lists/*
|
| 10 |
|
| 11 |
+
# 创建缓存目录
|
| 12 |
+
RUN mkdir -p /app/cache && \
|
| 13 |
+
chmod 777 /app/cache
|
| 14 |
+
|
| 15 |
# 安装 Python 依赖
|
| 16 |
COPY requirements.txt .
|
| 17 |
RUN pip install --no-cache-dir -r requirements.txt
|
| 18 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 19 |
# 复制应用文件
|
| 20 |
COPY . .
|
| 21 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 22 |
# 暴露端口
|
| 23 |
EXPOSE 7860
|
| 24 |
|
| 25 |
# 启动命令
|
| 26 |
+
CMD ["gunicorn", "--bind", "0.0.0.0:7860", "app:app"]
|