diff --git a/README.md b/README.md index be53ac6..1a9df69 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ portfolio = executor.execute(signals, data) ├── docker-compose.yml # Docker部署 ├── Dockerfile # 应用镜像 ├── Dockerfile_base # 基础镜像 -├── hk_ecs.pem # SSH密钥 +├── config/hk_ecs.pem # SSH密钥(港美股数据隧道) ├── README.md # 本文件 └── requirements.txt # 依赖 ``` diff --git a/build-and-push.sh b/build-and-push.sh index 579a2df..71a892d 100755 --- a/build-and-push.sh +++ b/build-and-push.sh @@ -80,10 +80,10 @@ echo "=========================================" echo "镜像地址: ${FULL_IMAGE_NAME}" echo "" echo "可以使用以下命令运行容器:" -echo "docker run -d --name etf-scheduler-container \\" -echo " -v /path/to/.env:/app/.env \\" -echo " -v /path/to/hk_ecs.pem:/app/hk_ecs.pem \\" -echo " -v /path/to/data:/app/data \\" +echo "docker run -d --name etf-scheduler-container \" +echo " -v /path/to/.env:/app/.env \" +echo " -v /path/to/config/hk_ecs.pem:/app/config/hk_ecs.pem \" +echo " -v /path/to/data:/app/data \" echo " ${FULL_IMAGE_NAME}" echo "" echo "或者在其他机器上拉取镜像:" diff --git a/datasource/flask_server.py b/datasource/flask_server.py index eedf9e4..ce6a468 100644 --- a/datasource/flask_server.py +++ b/datasource/flask_server.py @@ -92,7 +92,7 @@ def get_ssh_config() -> Optional[Dict]: "host": os.getenv('SSH_HOST', ''), "port": int(os.getenv('SSH_PORT', '22')), "username": os.getenv('SSH_USERNAME', ''), - "key_path": os.getenv('SSH_KEY_PATH', 'hk_ecs.pem'), + "key_path": os.getenv('SSH_KEY_PATH', 'config/hk_ecs.pem'), "local_port": int(os.getenv('SSH_LOCAL_PORT', '1080')), } diff --git a/docker-compose.yml b/docker-compose.yml index c8d6992..3754f27 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: # 挂载环境变量文件(必需) - ./.env:/app/.env:ro # 挂载 SSH 私钥(必需,用于 yfinance 数据下载) - - ./hk_ecs.pem:/app/hk_ecs.pem:ro + - ./config/hk_ecs.pem:/app/config/hk_ecs.pem:ro # 挂载数据目录(持久化) - ./data:/app/data # 挂载日志目录