diff --git a/.DS_Store b/.DS_Store index 5459385..e69d223 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/file-upload-site/Dockerfile b/file-upload-site/Dockerfile index 29777ab..47ac341 100644 --- a/file-upload-site/Dockerfile +++ b/file-upload-site/Dockerfile @@ -14,9 +14,12 @@ RUN pip install --no-cache-dir -r requirements.txt # 复制应用代码 COPY . . +# 启动脚本加执行权限 +RUN chmod +x start.sh + # 创建默认上传目录 RUN mkdir -p /app/uploads EXPOSE 5000 -CMD ["python3", "app.py"] +CMD ["./start.sh"] diff --git a/file-upload-site/docker-compose.yml b/file-upload-site/docker-compose.yml index e365218..581ac7c 100644 --- a/file-upload-site/docker-compose.yml +++ b/file-upload-site/docker-compose.yml @@ -2,7 +2,7 @@ services: file-upload: build: . container_name: file-upload-site - restart: unless-stopped + restart: always ports: - "7001:5000" env_file: @@ -10,3 +10,5 @@ services: volumes: # 映射 NAS 目录到容器内(按实际 NAS 挂载路径修改冒号左侧) - /volume1/文字稿:/app/uploads + # FRP 文件目录(按实际路径修改,目录下放 frpc 和 frpc.toml) + - /volume1/docker/frp:/frp:ro diff --git a/file-upload-site/start.sh b/file-upload-site/start.sh new file mode 100644 index 0000000..f74c431 --- /dev/null +++ b/file-upload-site/start.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +echo "Starting FRP client..." +/frp/frpc -c /frp/frpc.toml & + +echo "Starting file upload service..." +python3 app.py