resolve conflicts

This commit is contained in:
RockYang
2025-02-11 09:53:41 +08:00
7 changed files with 74 additions and 28 deletions

View File

@@ -7,7 +7,7 @@ services:
command: --default-authentication-plugin=mysql_native_password
restart: always
environment:
- MYSQL_ROOT_PASSWORD=12345678
- MYSQL_ROOT_PASSWORD=AwkYTv00xU9n
ports:
- "3307:3306"
volumes :
@@ -21,7 +21,7 @@ services:
image: registry.cn-shenzhen.aliyuncs.com/geekmaster/redis:6.0.6
restart: always
container_name: geekai-redis
command: redis-server --requirepass 12345678
command: redis-server --requirepass AwkYTv00xU9n
volumes :
- ./data/redis:/data
ports:
@@ -58,7 +58,7 @@ services:
# 后端 API 程序
geekai-api:
image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-api:v4.1.5-amd64
image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:v4.1.5-amd64
container_name: geekai-api
restart: always
depends_on:
@@ -80,7 +80,7 @@ services:
# 前端应用
geekai-web:
image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-web:v4.1.5-amd64
image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:v4.1.5-amd64
container_name: geekai-web
restart: always
depends_on: