diff --git a/projects/app/Dockerfile b/projects/app/Dockerfile index 5142d1207..5c98d5019 100644 --- a/projects/app/Dockerfile +++ b/projects/app/Dockerfile @@ -85,10 +85,10 @@ RUN chown -R nextjs:nodejs /app/data ENV NODE_ENV=production ENV NEXT_TELEMETRY_DISABLED=1 -ENV PORT=3000 +ENV PORT=3001 ENV NEXT_PUBLIC_BASE_URL=$base_url -EXPOSE 3000 +EXPOSE 3001 USER nextjs diff --git a/projects/app/data/config.json b/projects/app/data/config.json index 1d0303370..d22a190cc 100644 --- a/projects/app/data/config.json +++ b/projects/app/data/config.json @@ -2,7 +2,9 @@ { "feConfigs": { "lafEnv": "https://laf.dev", // laf环境。 https://laf.run (杭州阿里云) ,或者私有化的laf环境。如果使用 Laf openapi 功能,需要最新版的 laf 。 - "mcpServerProxyEndpoint": "" // mcp server 代理地址,例如: http://localhost:3005 + "mcpServerProxyEndpoint": "", // mcp server 代理地址,例如: http://localhost:3005 + "show_git":false, + "system_Title":"Test" }, "systemEnv": { "vectorMaxProcess": 10, // 向量处理线程数量 diff --git a/projects/app/docker-compose.yml b/projects/app/docker-compose.yml new file mode 100644 index 000000000..3d48f01ab --- /dev/null +++ b/projects/app/docker-compose.yml @@ -0,0 +1,38 @@ +version: '3.3' + +services: + martin-gpt: + image: martingpt:v4.8.1 # 个人构建的镜像 + container_name: martin-fastgpt + ports: + - '3001:3001' + networks: + - q00k04kgc8wk4k8okwog8owc_fastgpt + restart: always + environment: + - FE_DOMAIN= + - DEFAULT_ROOT_PSW=Pllh@123 + - 'AIPROXY_API_ENDPOINT=http://aiproxy:3000' + - AIPROXY_API_TOKEN=aiproxy + - DB_MAX_LINK=30 + - TOKEN_KEY=any + - ROOT_KEY=root_key + - FILE_TOKEN_KEY=filetoken + - 'MONGODB_URI=mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin' + - 'PG_URL=postgresql://username:password@pg:5432/postgres' + - 'REDIS_URL=redis://default:mypassword@redis:6379' + - 'SANDBOX_URL=http://sandbox:3000' + - LOG_LEVEL=info + - STORE_LOG_LEVEL=warn + - WORKFLOW_MAX_RUN_TIMES=1000 + - WORKFLOW_MAX_LOOP_TIMES=100 + - ALLOWED_ORIGINS= + - USE_IP_LIMIT=false + - CHAT_FILE_EXPIRE_TIME=7 + volumes: + - '/data/martingpt/config.json:/app/data/config.json' + +networks: + q00k04kgc8wk4k8okwog8owc_fastgpt: + external: true # 声明使用外部网络 + \ No newline at end of file diff --git a/projects/app/package.json b/projects/app/package.json index d0bb7b2d5..84b0bd0c1 100644 --- a/projects/app/package.json +++ b/projects/app/package.json @@ -3,9 +3,9 @@ "version": "4.9.10", "private": false, "scripts": { - "dev": "next dev", + "dev": "next dev -p 3001", "build": "next build", - "start": "next start", + "start": "next start -p 3001", "lint": "next lint" }, "dependencies": { diff --git a/个人记录.md b/个人记录.md new file mode 100644 index 000000000..d60b67e7f --- /dev/null +++ b/个人记录.md @@ -0,0 +1,35 @@ +# 格式化查看容器网络 + +方便测试网络的联通性,主要重启网络就会变,暂时先手动完成这一步 + +docker ps -q | xargs -n 1 docker inspect --format '容器ID: {{.Id}} +容器名称: {{.Name}} +状态: {{.State.Status}} +{{range $net, $settings := .NetworkSettings.Networks}}网络名称: {{$net}} + - IP地址: {{$settings.IPAddress}} + - 别名: {{printf "%v" $settings.Aliases}} +{{end}} +------------------------------------' + +# 更改项 +将app的port更改为3001(之前为3000),修改了包括dockerfile、package.json +# 构建一个镜像 +构建时间(服务器端2核8g)需要20分钟左右 + +## 官方构建命令 +docker build -f ./projects/app/Dockerfile -t registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.8.1 . --build-arg name=app + +## 自定义命令 +docker build -f ./projects/app/Dockerfile -t martingpt:v4.8.1 . --build-arg name=app +构建标签为martingpt版本为v4.8.1的images +可以通过docker images命令查看,在未构建该镜像时系统已经有如下镜像了: +【 +registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt v4.9.10-fix2 6ab06da546ca 9 days ago 380MB +registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server v4.9.10-fix2 ebfa023a0fde 9 days ago 181MB +registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox v4.9.10-fix2 cd3e0ac636f6 9 days ago 543MB +stirlingtools/stirling-pdf latest 48aebce79e99 2 weeks ago 1.88GB +registry.cn-hangzhou.aliyuncs.com/labring/aiproxy v0.1.7 ebeaca8b63cd 8 weeks ago 199MB +registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector v0.8.0-pg15 b3993e95063f 7 months ago 429MB +traefik v3.1 075808f3fdf7 7 months ago 178MB +registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo 5.0.18 021e1bd71d92 2 years ago 662MB +】 \ No newline at end of file