From 79f4dedbf71cc71f162a615de5f71657166dd1bb Mon Sep 17 00:00:00 2001 From: qingfengfenga Date: Wed, 21 Feb 2024 14:28:04 +0800 Subject: [PATCH 1/2] Add postgre docker-compose file --- docker-compose-pg.yml | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 docker-compose-pg.yml diff --git a/docker-compose-pg.yml b/docker-compose-pg.yml new file mode 100644 index 000000000..4650d2e9d --- /dev/null +++ b/docker-compose-pg.yml @@ -0,0 +1,50 @@ +version: '3.4' + +services: + one-api: + image: justsong/one-api:latest + container_name: one-api + restart: always + command: --log-dir /app/logs + ports: + - "3000:3000" + volumes: + - ./data/oneapi:/data + - ./logs:/app/logs + environment: +# - SQL_DSN=oneapi:123456@tcp(db:3306)/one-api # 修改此行，或注释掉以使用 SQLite 作为数据库 + - SQL_DSN=postgres://oneapi:123456@db:5432/one-api + - REDIS_CONN_STRING=redis://redis + - SESSION_SECRET=random_string # 修改为随机字符串 + - TZ=Asia/Shanghai +# - NODE_TYPE=slave # 多机部署时从节点取消注释该行 +# - SYNC_FREQUENCY=60 # 需要定期从数据库加载数据时取消注释该行 +# - FRONTEND_BASE_URL=https://openai.justsong.cn # 多机部署时从节点取消注释该行 + depends_on: + - redis + - db + healthcheck: + test: [ "CMD-SHELL", "wget -q -O - http://localhost:3000/api/status | grep -o '\"success\":\\s*true' | awk -F: '{print $2}'" ] + interval: 30s + timeout: 10s + retries: 3 + + redis: + image: redis:latest + container_name: redis + restart: always + + db: + image: postgres:16.1-alpine3.19 # mysql版本 + restart: always + container_name: postgres # 容器名 + volumes: + - ./data/postgres:/var/lib/postgresql/data #挂载目录，持久化存储 + #- ./init/init-user-db.sh:/docker-entrypoint-initdb.d/init-user-db.sh # 初始化脚本，创建用户和数据库 + ports: + - '5432:5432' + environment: + POSTGRES_USER: 'oneapi' + POSTGRES_PASSWORD: '123456' # 设置postgres用户密码 + POSTGRES_DB: 'one-api' + PGDATA: '/var/lib/postgresql/data/pgdata' # 设置数据目录 \ No newline at end of file From b07f70126137028fbeb3c963d6a49b4d8fc2f0c1 Mon Sep 17 00:00:00 2001 From: qingfengfenga Date: Wed, 21 Feb 2024 14:39:11 +0800 Subject: [PATCH 2/2] Add theme selection environment variables --- docker-compose-pg.yml | 6 +++--- docker-compose.yml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker-compose-pg.yml b/docker-compose-pg.yml index 4650d2e9d..053a03941 100644 --- a/docker-compose-pg.yml +++ b/docker-compose-pg.yml @@ -20,6 +20,7 @@ services: # - NODE_TYPE=slave # 多机部署时从节点取消注释该行 # - SYNC_FREQUENCY=60 # 需要定期从数据库加载数据时取消注释该行 # - FRONTEND_BASE_URL=https://openai.justsong.cn # 多机部署时从节点取消注释该行 + - THEME=berry # 使用berry主题，注销该行使用默认主题 depends_on: - redis - db @@ -35,16 +36,15 @@ services: restart: always db: - image: postgres:16.1-alpine3.19 # mysql版本 + image: postgres:16.1-alpine3.19 # 数据库版本 restart: always container_name: postgres # 容器名 volumes: - ./data/postgres:/var/lib/postgresql/data #挂载目录，持久化存储 - #- ./init/init-user-db.sh:/docker-entrypoint-initdb.d/init-user-db.sh # 初始化脚本，创建用户和数据库 ports: - '5432:5432' environment: POSTGRES_USER: 'oneapi' - POSTGRES_PASSWORD: '123456' # 设置postgres用户密码 + POSTGRES_PASSWORD: '123456' # 设置用户密码 POSTGRES_DB: 'one-api' PGDATA: '/var/lib/postgresql/data/pgdata' # 设置数据目录 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 30edb281a..fd121ae3a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,6 +19,7 @@ services: # - NODE_TYPE=slave # 多机部署时从节点取消注释该行 # - SYNC_FREQUENCY=60 # 需要定期从数据库加载数据时取消注释该行 # - FRONTEND_BASE_URL=https://openai.justsong.cn # 多机部署时从节点取消注释该行 + - THEME=berry # 使用berry主题，注销该行使用默认主题 depends_on: - redis - db