From 31c4d460dbe82aa6e9b4e5a1dcbf01b9028b5d1e Mon Sep 17 00:00:00 2001 From: Nelson <1475262689@qq.com> Date: Fri, 12 Jun 2026 17:16:36 +0800 Subject: [PATCH] add docker imp --- .DS_Store | Bin 6148 -> 6148 bytes file-upload-site/Dockerfile | 5 ++++- file-upload-site/docker-compose.yml | 4 +++- file-upload-site/start.sh | 8 ++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 file-upload-site/start.sh diff --git a/.DS_Store b/.DS_Store index 54593850d1dd2f8c07988caa6988c48682842e52..e69d2233e39c7f138b276e15d49d229bac1a8354 100644 GIT binary patch delta 556 zcmZoMXfc=|#>B!ku~2NHo+2ab#(>?7ix)66F|uyvVd7!{s zynt|0VsdtRQGRJ&igSKWevwm7X==Oxe{n{Bxo2{IUO-W5S!QZ^L`iBzNpNNrP)Z0* zLr`i;Tv9#UkdVp(pdt}8MeaqZsd>@qMVTr7X=%l&B@syMNRV~OMfo{70r|z5C7Jno zkuhNFOHy+^^V0HxR)U=1UjULS4ofX62GVGH>htp=A`^>>67$kiohoB<5|dJM{PUdh zOG@%{BQk;h0J$A(XK+Dca%Nt-vi%1JFyK^n(15T67?dFl1_llh7z;`>Dj!IPFhlb4 z^HPDD0w7#v2X7D~28cNrv>6;3f`RNph6aY|42v1oGaO_%$MBfpE5mB)qu~2NHo+2a5#(>?7j4YdZSa=!P%`J5l3{5R3E3hU^u4V7qtibV? ic{4i)KL=3#W 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