mirror of
https://github.com/yangjian102621/geekai.git
synced 2025-11-09 10:43:44 +08:00
merge v4.1.1 and fixed conflicts
This commit is contained in:
@@ -45,7 +45,7 @@ services:
|
||||
restart: always
|
||||
ports:
|
||||
- "9998:9998"
|
||||
|
||||
|
||||
midjourney-proxy:
|
||||
image: registry.cn-shenzhen.aliyuncs.com/geekmaster/midjourney-proxy:2.6.2
|
||||
container_name: geekai-midjourney-proxy
|
||||
@@ -56,9 +56,9 @@ services:
|
||||
- ./conf/mj-proxy:/home/spring/config
|
||||
|
||||
|
||||
# 后端 API 程序
|
||||
# 后端 API 程序
|
||||
geekai-api:
|
||||
image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:v4.1.0-amd64
|
||||
image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:v4.1.1-amd64
|
||||
container_name: geekai-api
|
||||
restart: always
|
||||
depends_on:
|
||||
@@ -80,7 +80,7 @@ services:
|
||||
|
||||
# 前端应用
|
||||
geekai-web:
|
||||
image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:v4.1.0-amd64
|
||||
image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:v4.1.1-amd64
|
||||
container_name: geekai-web
|
||||
restart: always
|
||||
depends_on:
|
||||
@@ -91,5 +91,4 @@ services:
|
||||
- ./logs/nginx:/var/log/nginx
|
||||
- ./conf/nginx/conf.d:/etc/nginx/conf.d
|
||||
- ./conf/nginx/nginx.conf:/etc/nginx/nginx.conf
|
||||
- ./conf/nginx/ssl:/etc/nginx/ssl
|
||||
|
||||
- ./conf/nginx/ssl:/etc/nginx/ssl
|
||||
Reference in New Issue
Block a user