diff --git a/.env.example b/.env.example index 4dfe6367..059a2c48 100644 --- a/.env.example +++ b/.env.example @@ -29,8 +29,8 @@ DB_ENABLED=true # SQLITE_PATH=./data/openflare.db DB_HOST=postgres DB_PORT=5432 -DB_USERNAME=postgres -DB_PASSWORD=postgres +DB_USERNAME=openflare +DB_PASSWORD=replace-with-strong-password DB_NAME=openflare DB_SSL_MODE=disable DB_TIMEZONE=Asia/Shanghai @@ -51,7 +51,7 @@ REDIS_KEY_PREFIX=openflare: # ─── ClickHouse(必需)──────────────────────────────────────────────────── CLICKHOUSE_HOST=clickhouse:9000 CLICKHOUSE_USERNAME=default -CLICKHOUSE_PASSWORD=123456 +CLICKHOUSE_PASSWORD=replace-with-clickhouse-password CLICKHOUSE_NAME=openflare # ─── 日志 ────────────────────────────────────────────────────────────────────── diff --git a/README.en.md b/README.en.md index 45ca8b25..984cf0f4 100644 --- a/README.en.md +++ b/README.en.md @@ -77,13 +77,13 @@ services: image: postgres:17-alpine restart: unless-stopped environment: - POSTGRES_DB: openflare - POSTGRES_USER: openflare - POSTGRES_PASSWORD: replace-with-strong-password + POSTGRES_DB: ${DB_NAME:-openflare} + POSTGRES_USER: ${DB_USERNAME:-openflare} + POSTGRES_PASSWORD: ${DB_PASSWORD:-replace-with-strong-password} volumes: - ./data/postgres_data:/var/lib/postgresql/data healthcheck: - test: ["CMD-SHELL", "pg_isready -U openflare -d openflare"] + test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME:-openflare} -d ${DB_NAME:-openflare}"] interval: 10s timeout: 5s retries: 5 @@ -105,15 +105,15 @@ services: image: clickhouse/clickhouse-server:25.3-alpine restart: unless-stopped environment: - CLICKHOUSE_DB: openflare - CLICKHOUSE_USER: default - CLICKHOUSE_PASSWORD: 123456 + CLICKHOUSE_DB: ${CLICKHOUSE_NAME:-openflare} + CLICKHOUSE_USER: ${CLICKHOUSE_USERNAME:-default} + CLICKHOUSE_PASSWORD: ${CLICKHOUSE_PASSWORD:-replace-with-clickhouse-password} CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1 TZ: ${TZ:-Asia/Shanghai} volumes: - ./data/clickhouse_data:/var/lib/clickhouse healthcheck: - test: ["CMD", "clickhouse-client", "--query", "SELECT 1"] + test: ["CMD", "clickhouse-client", "--user", "${CLICKHOUSE_USERNAME:-default}", "--password", "${CLICKHOUSE_PASSWORD:-replace-with-clickhouse-password}", "--query", "SELECT 1"] interval: 10s timeout: 5s retries: 5 diff --git a/README.md b/README.md index 0dd75493..af02f017 100644 --- a/README.md +++ b/README.md @@ -84,13 +84,13 @@ services: image: postgres:17-alpine restart: unless-stopped environment: - POSTGRES_DB: openflare - POSTGRES_USER: openflare - POSTGRES_PASSWORD: replace-with-strong-password + POSTGRES_DB: ${DB_NAME:-openflare} + POSTGRES_USER: ${DB_USERNAME:-openflare} + POSTGRES_PASSWORD: ${DB_PASSWORD:-replace-with-strong-password} volumes: - ./data/postgres_data:/var/lib/postgresql/data healthcheck: - test: ["CMD-SHELL", "pg_isready -U openflare -d openflare"] + test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME:-openflare} -d ${DB_NAME:-openflare}"] interval: 10s timeout: 5s retries: 5 @@ -112,15 +112,15 @@ services: image: clickhouse/clickhouse-server:25.3-alpine restart: unless-stopped environment: - CLICKHOUSE_DB: openflare - CLICKHOUSE_USER: default - CLICKHOUSE_PASSWORD: 123456 + CLICKHOUSE_DB: ${CLICKHOUSE_NAME:-openflare} + CLICKHOUSE_USER: ${CLICKHOUSE_USERNAME:-default} + CLICKHOUSE_PASSWORD: ${CLICKHOUSE_PASSWORD:-replace-with-clickhouse-password} CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1 TZ: ${TZ:-Asia/Shanghai} volumes: - ./data/clickhouse_data:/var/lib/clickhouse healthcheck: - test: ["CMD", "clickhouse-client", "--query", "SELECT 1"] + test: ["CMD", "clickhouse-client", "--user", "${CLICKHOUSE_USERNAME:-default}", "--password", "${CLICKHOUSE_PASSWORD:-replace-with-clickhouse-password}", "--query", "SELECT 1"] interval: 10s timeout: 5s retries: 5 diff --git a/docker-compose.yaml b/docker-compose.yaml index 7e0b654f..d550f9e4 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -34,13 +34,13 @@ services: ports: - "5432:5432" environment: - POSTGRES_DB: openflare - POSTGRES_USER: openflare - POSTGRES_PASSWORD: replace-with-strong-password + POSTGRES_DB: ${DB_NAME:-openflare} + POSTGRES_USER: ${DB_USERNAME:-openflare} + POSTGRES_PASSWORD: ${DB_PASSWORD:-replace-with-strong-password} volumes: - ./data/postgres_data:/var/lib/postgresql/data healthcheck: - test: ["CMD-SHELL", "pg_isready -U openflare -d openflare"] + test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME:-openflare} -d ${DB_NAME:-openflare}"] interval: 10s timeout: 5s retries: 5 @@ -74,9 +74,9 @@ services: image: clickhouse/clickhouse-server:25.3-alpine restart: unless-stopped environment: - CLICKHOUSE_DB: openflare - CLICKHOUSE_USER: default - CLICKHOUSE_PASSWORD: 123456 + CLICKHOUSE_DB: ${CLICKHOUSE_NAME:-openflare} + CLICKHOUSE_USER: ${CLICKHOUSE_USERNAME:-default} + CLICKHOUSE_PASSWORD: ${CLICKHOUSE_PASSWORD:-replace-with-clickhouse-password} CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1 TZ: ${TZ:-Asia/Shanghai} ports: @@ -85,7 +85,7 @@ services: volumes: - ./data/clickhouse_data:/var/lib/clickhouse healthcheck: - test: ["CMD", "clickhouse-client", "--query", "SELECT 1"] + test: ["CMD", "clickhouse-client", "--user", "${CLICKHOUSE_USERNAME:-default}", "--password", "${CLICKHOUSE_PASSWORD:-replace-with-clickhouse-password}", "--query", "SELECT 1"] interval: 10s timeout: 5s retries: 5 diff --git a/docs/deployment/server.md b/docs/deployment/server.md index 0cffef9a..d7f3e9d0 100644 --- a/docs/deployment/server.md +++ b/docs/deployment/server.md @@ -121,13 +121,13 @@ services: image: postgres:17-alpine restart: unless-stopped environment: - POSTGRES_DB: openflare - POSTGRES_USER: openflare - POSTGRES_PASSWORD: replace-with-strong-password + POSTGRES_DB: ${DB_NAME:-openflare} + POSTGRES_USER: ${DB_USERNAME:-openflare} + POSTGRES_PASSWORD: ${DB_PASSWORD:-replace-with-strong-password} volumes: - ./data/postgres_data:/var/lib/postgresql/data healthcheck: - test: ["CMD-SHELL", "pg_isready -U openflare -d openflare"] + test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME:-openflare} -d ${DB_NAME:-openflare}"] interval: 10s timeout: 5s retries: 5 @@ -149,15 +149,15 @@ services: image: clickhouse/clickhouse-server:25.3-alpine restart: unless-stopped environment: - CLICKHOUSE_DB: openflare - CLICKHOUSE_USER: default - CLICKHOUSE_PASSWORD: replace-with-clickhouse-password + CLICKHOUSE_DB: ${CLICKHOUSE_NAME:-openflare} + CLICKHOUSE_USER: ${CLICKHOUSE_USERNAME:-default} + CLICKHOUSE_PASSWORD: ${CLICKHOUSE_PASSWORD:-replace-with-clickhouse-password} CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1 TZ: ${TZ:-Asia/Shanghai} volumes: - ./data/clickhouse_data:/var/lib/clickhouse healthcheck: - test: ["CMD", "clickhouse-client", "--query", "SELECT 1"] + test: ["CMD", "clickhouse-client", "--user", "${CLICKHOUSE_USERNAME:-default}", "--password", "${CLICKHOUSE_PASSWORD:-replace-with-clickhouse-password}", "--query", "SELECT 1"] interval: 10s timeout: 5s retries: 5 @@ -215,13 +215,13 @@ services: image: postgres:17-alpine restart: unless-stopped environment: - POSTGRES_DB: openflare - POSTGRES_USER: openflare - POSTGRES_PASSWORD: replace-with-strong-password + POSTGRES_DB: ${DB_NAME:-openflare} + POSTGRES_USER: ${DB_USERNAME:-openflare} + POSTGRES_PASSWORD: ${DB_PASSWORD:-replace-with-strong-password} volumes: - ./data/postgres_data:/var/lib/postgresql/data healthcheck: - test: ["CMD-SHELL", "pg_isready -U openflare -d openflare"] + test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME:-openflare} -d ${DB_NAME:-openflare}"] interval: 10s timeout: 5s retries: 5 @@ -253,15 +253,15 @@ services: image: clickhouse/clickhouse-server:25.3-alpine restart: unless-stopped environment: - CLICKHOUSE_DB: openflare - CLICKHOUSE_USER: default - CLICKHOUSE_PASSWORD: replace-with-clickhouse-password + CLICKHOUSE_DB: ${CLICKHOUSE_NAME:-openflare} + CLICKHOUSE_USER: ${CLICKHOUSE_USERNAME:-default} + CLICKHOUSE_PASSWORD: ${CLICKHOUSE_PASSWORD:-replace-with-clickhouse-password} CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1 TZ: ${TZ:-Asia/Shanghai} volumes: - ./data/clickhouse_data:/var/lib/clickhouse healthcheck: - test: ["CMD", "clickhouse-client", "--query", "SELECT 1"] + test: ["CMD", "clickhouse-client", "--user", "${CLICKHOUSE_USERNAME:-default}", "--password", "${CLICKHOUSE_PASSWORD:-replace-with-clickhouse-password}", "--query", "SELECT 1"] interval: 10s timeout: 5s retries: 5 diff --git a/docs/guide/quick-start.md b/docs/guide/quick-start.md index b7e064ec..d8af0a3a 100644 --- a/docs/guide/quick-start.md +++ b/docs/guide/quick-start.md @@ -50,9 +50,9 @@ services: DB_ENABLED: "true" DB_HOST: "postgres" DB_PORT: "5432" - DB_USERNAME: "openflare" - DB_PASSWORD: "replace-with-strong-password" - DB_NAME: "openflare" + DB_USERNAME: "${DB_USERNAME:-openflare}" + DB_PASSWORD: "${DB_PASSWORD:-replace-with-strong-password}" + DB_NAME: "${DB_NAME:-openflare}" REDIS_ENABLED: "true" REDIS_ADDRS: "redis:6379" CLICKHOUSE_ENABLED: "true" @@ -69,13 +69,13 @@ services: image: postgres:17-alpine restart: unless-stopped environment: - POSTGRES_DB: openflare - POSTGRES_USER: openflare - POSTGRES_PASSWORD: replace-with-strong-password + POSTGRES_DB: ${DB_NAME:-openflare} + POSTGRES_USER: ${DB_USERNAME:-openflare} + POSTGRES_PASSWORD: ${DB_PASSWORD:-replace-with-strong-password} volumes: - ./data/postgres_data:/var/lib/postgresql/data healthcheck: - test: ["CMD-SHELL", "pg_isready -U openflare -d openflare"] + test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME:-openflare} -d ${DB_NAME:-openflare}"] interval: 10s timeout: 5s retries: 5 @@ -98,13 +98,13 @@ services: environment: CLICKHOUSE_DB: openflare CLICKHOUSE_USER: default - CLICKHOUSE_PASSWORD: 123456 + CLICKHOUSE_PASSWORD: ${CLICKHOUSE_PASSWORD:-replace-with-clickhouse-password} CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1 TZ: Asia/Shanghai volumes: - ./data/clickhouse_data:/var/lib/clickhouse healthcheck: - test: ["CMD", "clickhouse-client", "--query", "SELECT 1"] + test: ["CMD", "clickhouse-client", "--user", "${CLICKHOUSE_USERNAME:-default}", "--password", "${CLICKHOUSE_PASSWORD:-replace-with-clickhouse-password}", "--query", "SELECT 1"] interval: 10s timeout: 5s retries: 5