diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index e8e6e92d2..fe5ba0fe9 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -29,20 +29,28 @@ jobs: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GH_PAT }} - - name: Build and publish image for tag push event only - if: startsWith(github.ref_name , 'v') + - name: Set DOCKER_REPO_TAGGED based on branch or tag + run: | + if [[ "${{ github.ref_name }}" == "main" ]]; then + echo "DOCKER_REPO_TAGGED=ghcr.io/${{ github.repository_owner }}/fastgpt:latest" >> $GITHUB_ENV + else + echo "DOCKER_REPO_TAGGED=ghcr.io/${{ github.repository_owner }}/fastgpt:${{ github.ref_name }}" >> $GITHUB_ENV + fi + + - name: Build and publish image for main branch or tag push event env: - DOCKER_REPO_TAGGED: ghcr.io/${{ github.repository_owner }}/fastgpt:${{ github.ref_name }} + DOCKER_REPO_TAGGED: ${{ env.DOCKER_REPO_TAGGED }} 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=fastgpt image" \ - --label "org.opencontainers.image.licenses=MIT" \ - --push \ - -t ${DOCKER_REPO_TAGGED} \ - -f Dockerfile \ - . + --platform linux/amd64,linux/arm64 \ + --label "org.opencontainers.image.source= https://github.com/ ${{ github.repository_owner }}/FastGPT" \ + --label "org.opencontainers.image.description=fastgpt image" \ + --label "org.opencontainers.image.licenses=MIT" \ + --push \ + -t ${DOCKER_REPO_TAGGED} \ + -f Dockerfile \ + . + push-to-docker-hub: needs: build-images runs-on: ubuntu-20.04 @@ -55,8 +63,8 @@ jobs: username: ${{ secrets.DOCKER_HUB_NAME }} password: ${{ secrets.DOCKER_HUB_PASSWORD }} - name: Pull image from GitHub Container Registry - run: docker pull ghcr.io/${{ github.repository_owner }}/fastgpt:${{ github.ref_name }} + run: docker pull ghcr.io/${{ github.repository_owner }}/fastgpt:${{ github.ref_name }} - name: Tag image with Docker Hub repository name and version tag - run: docker tag ghcr.io/${{ github.repository_owner }}/fastgpt:${{ github.ref_name }} ${{ secrets.DOCKER_IMAGE_NAME }}:${{ github.ref_name }} + run: docker tag ghcr.io/${{ github.repository_owner }}/fastgpt:${{ github.ref_name }} ${{ secrets.DOCKER_IMAGE_NAME }}:${{ github.ref_name }} - name: Push image to Docker Hub - run: docker push ${{ secrets.DOCKER_IMAGE_NAME }}:${{ github.ref_name }} + run: docker push ${{ secrets.DOCKER_IMAGE_NAME }}:${{ github.ref_name }} diff --git a/Makefile b/Makefile index fac5d9045..5f2c7d8f2 100644 --- a/Makefile +++ b/Makefile @@ -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 fastgpt -v /web_project/yjl/fastgpt/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/fastgpt/docker-compose.yml b/docs/deploy/fastgpt/docker-compose.yml index b1cad541d..cab8ff616 100644 --- a/docs/deploy/fastgpt/docker-compose.yml +++ b/docs/deploy/fastgpt/docker-compose.yml @@ -1,7 +1,8 @@ version: '3.3' services: pg: - image: ankane/pgvector:v0.4.2 + image: ankane/pgvector:v0.4.2 # dockerhub + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:v0.4.2 # 阿里云 container_name: pg restart: always ports: