diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e2bbd54be..b0fac460e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,12 +37,12 @@ jobs: - name: build and publish image env: # fork friendly ^^ - DOCKER_REPO: ghcr.io/${{ github.repository_owner }}/fast-gpt + DOCKER_REPO: ghcr.io/${{ github.repository_owner }}/fastgpt run: | docker buildx build \ --platform linux/amd64,linux/arm64 \ --label "org.opencontainers.image.source=https://github.com/${{ github.repository_owner }}/FastGPT" \ - --label "org.opencontainers.image.description=fast-gpt image" \ + --label "org.opencontainers.image.description=fastgpt image" \ --label "org.opencontainers.image.licenses=MIT" \ --push \ -t ${DOCKER_REPO}:latest \ diff --git a/Makefile b/Makefile index 2e607f692..5f2c7d8f2 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -SERVICE_NAME=fast-gpt +SERVICE_NAME=fastgpt # Image URL to use all building/pushing image targets IMG ?= $(SERVICE_NAME):latest @@ -34,13 +34,13 @@ run: ## Run a dev service from host. .PHONY: docker-build docker-build: ## Build docker image with the desktop-frontend. - docker build -t c121914yu/fast-gpt:latest . --network host --build-arg HTTP_PROXY=http://127.0.0.1:7890 --build-arg HTTPS_PROXY=http://127.0.0.1:7890 + docker build -t registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:latest . --network host --build-arg HTTP_PROXY=http://127.0.0.1:7890 --build-arg HTTPS_PROXY=http://127.0.0.1:7890 ##@ Deployment .PHONY: docker-run docker-run: ## Push docker image. - docker run -d -p 8008:3000 --name fast-gpt -v /web_project/yjl/fast-gpt/logs:/app/.next/logs c121914yu/fast-gpt:latest + docker run -d -p 8008:3000 --name fastgpt -v /web_project/yjl/fastgpt/logs:/app/.next/logs registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:latest #TODO: add support of docker push diff --git a/docs/deploy/docker.md b/docs/deploy/docker.md index 52eb21b10..a48b28492 100644 --- a/docs/deploy/docker.md +++ b/docs/deploy/docker.md @@ -161,11 +161,11 @@ services: - /root/fastgpt/mongo/data:/data/db - /root/fastgpt/mongo/logs:/var/log/mongodb - /etc/localtime:/etc/localtime:ro - fast-gpt: - image: c121914yu/fast-gpt:latest + fastgpt: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:latest network_mode: host restart: always - container_name: fast-gpt + container_name: fastgpt environment: # proxy(可选) - AXIOS_PROXY_HOST=127.0.0.1 @@ -225,7 +225,7 @@ docker-compose up -d echo "Docker Compose 重新拉取镜像完成!" # 删除本地旧镜像 -images=$(docker images --format "{{.ID}} {{.Repository}}" | grep fast-gpt) +images=$(docker images --format "{{.ID}} {{.Repository}}" | grep fastgpt) # 将镜像 ID 和名称放入数组中 IFS=$'\n' read -rd '' -a image_array <<<"$images" diff --git a/docs/deploy/fastgpt/clash/proxy.sh b/docs/deploy/fastgpt/clash/proxy.sh index c3c01abd5..fcfa4b1a1 100644 --- a/docs/deploy/fastgpt/clash/proxy.sh +++ b/docs/deploy/fastgpt/clash/proxy.sh @@ -11,7 +11,7 @@ if [ ! -z "$OLD_PROCESS" ]; then fi sleep 2 -cd /root/fast-gpt/clash/fast +cd /root/fastgpt/clash/fast rm -f ./nohup.out || true rm -f ./cache.db || true nohup ./clash-linux-amd64-v3 -d ./ & diff --git a/docs/deploy/fastgpt/docker-compose.yml b/docs/deploy/fastgpt/docker-compose.yml index a2077eb6f..669182dbd 100644 --- a/docs/deploy/fastgpt/docker-compose.yml +++ b/docs/deploy/fastgpt/docker-compose.yml @@ -30,11 +30,11 @@ services: - /root/fastgpt/mongo/data:/data/db - /root/fastgpt/mongo/logs:/var/log/mongodb - /etc/localtime:/etc/localtime:ro - fast-gpt: - image: c121914yu/fast-gpt:latest + fastgpt: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:latest network_mode: host restart: always - container_name: fast-gpt + container_name: fastgpt environment: # proxy(可选) - AXIOS_PROXY_HOST=127.0.0.1 @@ -78,4 +78,3 @@ services: # https证书,没有的话不填,对应的nginx.conf也要修改 - /root/fastgpt/nginx/ssl/docgpt.key:/ssl/docgpt.key - /root/fastgpt/nginx/ssl/docgpt.pem:/ssl/docgpt.pem - diff --git a/docs/deploy/fastgpt/run.sh b/docs/deploy/fastgpt/run.sh index e8fa46203..8deb87046 100644 --- a/docs/deploy/fastgpt/run.sh +++ b/docs/deploy/fastgpt/run.sh @@ -5,7 +5,7 @@ docker-compose up -d echo "Docker Compose 重新拉取镜像完成!" # 删除本地旧镜像 -images=$(docker images --format "{{.ID}} {{.Repository}}" | grep fast-gpt) +images=$(docker images --format "{{.ID}} {{.Repository}}" | grep fastgpt) # 将镜像 ID 和名称放入数组中 IFS=$'\n' read -rd '' -a image_array <<<"$images" diff --git a/docs/deploy/mac.md b/docs/deploy/mac.md index 7262c5ad5..a07550290 100644 --- a/docs/deploy/mac.md +++ b/docs/deploy/mac.md @@ -19,15 +19,15 @@ docker -v 6、需要创建一个放置 pg 和 mongo 数据的文件夹,这里创建在`~/fastgpt`目录中,里面有`pg` 和`mongo `两个文件夹 ``` -➜ fast-gpt pwd -/Users/jie/fast-gpt -➜ fast-gpt ls +➜ fastgpt pwd +/Users/jie/fastgpt +➜ fastgpt ls mongo pg ``` ### docker 部署方式 -这种方式主要是为了方便调试,可以使用`pnpm dev ` 运行 fast-gpt 项目 +这种方式主要是为了方便调试,可以使用`pnpm dev ` 运行 fastgpt 项目 **1、.env.local 文件** @@ -61,13 +61,13 @@ PG_DB_NAME=xxx **2、部署 mongo** ``` -docker run --name mongo -p 27017:27017 -e MONGO_INITDB_ROOT_USERNAME=username -e MONGO_INITDB_ROOT_PASSWORD=password -v ~/fast-gpt/mongo/data:/data/db -d mongo:4.0.1 +docker run --name mongo -p 27017:27017 -e MONGO_INITDB_ROOT_USERNAME=username -e MONGO_INITDB_ROOT_PASSWORD=password -v ~/fastgpt/mongo/data:/data/db -d mongo:4.0.1 ``` **3、部署 pgsql** ``` -docker run -it --name pg -e "POSTGRES_PASSWORD=xxx" -e POSTGRES_USER=xxx -p 8100:5432 -v ~/fast-gpt/pg/data:/var/lib/postgresql/data -d octoberlan/pgvector:v0.4.1 +docker run -it --name pg -e "POSTGRES_PASSWORD=xxx" -e POSTGRES_USER=xxx -p 8100:5432 -v ~/fastgpt/pg/data:/var/lib/postgresql/data -d octoberlan/pgvector:v0.4.1 ``` 进 pgsql 容器运行