merge conflicts for v4.0.5

This commit is contained in:
RockYang
2024-05-21 11:30:40 +08:00
181 changed files with 5241 additions and 1437 deletions

View File

@@ -1,12 +1,12 @@
# GO api docker 镜像创建
FROM alpine:3.18.2
FROM registry.cn-hangzhou.aliyuncs.com/geekmaster/alpine:3.18.2
MAINTAINER yangjian<yangjian102621@163.com>
WORKDIR /var/www/app
COPY ./api/bin/chatgpt-plus-linux /var/www/app
COPY ./api/bin/geekai-linux /var/www/app
EXPOSE 5678
# 容器启动时执行的命令
CMD ["./chatgpt-plus-linux"]
CMD ["./geekai-linux"]

View File

@@ -1,5 +1,5 @@
# 前端 Vue 项目构建
FROM nginx:1.20.2
FROM registry.cn-hangzhou.aliyuncs.com/geekmaster/nginx:1.20.2
MAINTAINER yangjian<yangjian102621@163.com>