From 9d9983fb3ff682e6a50b0a466ea853fe3ce9be17 Mon Sep 17 00:00:00 2001 From: aaron <> Date: Thu, 14 May 2026 22:18:59 +0800 Subject: [PATCH] 1 --- README.md | 11 ++++++++++- docker-compose.yml | 30 +++++++++++++++--------------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 84924bf..5c7436b 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,19 @@ python3 -m app 默认登录: - 用户名:`admin` -- 密码:`change-me-now` +- 密码:由 `ADMIN_PASSWORD` 决定,`.env.example` 中示例为 `12345678` 首次启动会把 `ADMIN_PASSWORD` 写入数据库并保存为哈希。之后请在管理台的「账号安全」页面修改密码;修改后环境变量不会覆盖数据库中的新密码。 +Docker Compose 会自动读取同目录 `.env`。示例: + +```env +ADMIN_USERNAME=admin +ADMIN_PASSWORD=12345678 +SESSION_SECRET=DBUwycvdxjSUZX4LMvUKa0xMzWKzFJmg +WEBHOOK_TOKEN=vvyVmc33aC0I85LkH4yrd6ojvkqmyrb1 +``` + ## Docker ```bash diff --git a/docker-compose.yml b/docker-compose.yml index 5392bdb..4e7dfc2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,13 +4,13 @@ services: ports: - "8030:8000" environment: - ADMIN_USERNAME: admin - ADMIN_PASSWORD: change-me-now - SESSION_SECRET: replace-with-a-long-random-secret - WEBHOOK_TOKEN: replace-with-a-shared-webhook-secret - RETENTION_DAYS: 30 - MAX_DELIVERY_ATTEMPTS: 3 - RETRY_BACKOFF_SECONDS: 60 + ADMIN_USERNAME: ${ADMIN_USERNAME:-admin} + ADMIN_PASSWORD: ${ADMIN_PASSWORD:-change-me-now} + SESSION_SECRET: ${SESSION_SECRET:-replace-with-a-long-random-secret} + WEBHOOK_TOKEN: ${WEBHOOK_TOKEN:-} + RETENTION_DAYS: ${RETENTION_DAYS:-30} + MAX_DELIVERY_ATTEMPTS: ${MAX_DELIVERY_ATTEMPTS:-3} + RETRY_BACKOFF_SECONDS: ${RETRY_BACKOFF_SECONDS:-60} volumes: - dispatcher-data:/data @@ -18,14 +18,14 @@ services: build: . command: ["python", "-m", "app.worker"] environment: - ADMIN_USERNAME: admin - ADMIN_PASSWORD: change-me-now - SESSION_SECRET: replace-with-a-long-random-secret - WEBHOOK_TOKEN: replace-with-a-shared-webhook-secret - RETENTION_DAYS: 30 - MAX_DELIVERY_ATTEMPTS: 3 - RETRY_BACKOFF_SECONDS: 60 - WORKER_INTERVAL_SECONDS: 15 + ADMIN_USERNAME: ${ADMIN_USERNAME:-admin} + ADMIN_PASSWORD: ${ADMIN_PASSWORD:-change-me-now} + SESSION_SECRET: ${SESSION_SECRET:-replace-with-a-long-random-secret} + WEBHOOK_TOKEN: ${WEBHOOK_TOKEN:-} + RETENTION_DAYS: ${RETENTION_DAYS:-30} + MAX_DELIVERY_ATTEMPTS: ${MAX_DELIVERY_ATTEMPTS:-3} + RETRY_BACKOFF_SECONDS: ${RETRY_BACKOFF_SECONDS:-60} + WORKER_INTERVAL_SECONDS: ${WORKER_INTERVAL_SECONDS:-15} volumes: - dispatcher-data:/data