diff --git a/.github/workflows/fastgpt-image.yml b/.github/workflows/fastgpt-image.yml index 09a4c2a5a675..177ab380695b 100644 --- a/.github/workflows/fastgpt-image.yml +++ b/.github/workflows/fastgpt-image.yml @@ -42,9 +42,9 @@ jobs: - 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 + echo "DOCKER_REPO_TAGGED=ghcr.io/${{ github.repository_owner }}/aai:latest" >> $GITHUB_ENV else - echo "DOCKER_REPO_TAGGED=ghcr.io/${{ github.repository_owner }}/fastgpt:${{ github.ref_name }}" >> $GITHUB_ENV + echo "DOCKER_REPO_TAGGED=ghcr.io/${{ github.repository_owner }}/aai:${{ github.ref_name }}" >> $GITHUB_ENV fi - name: Build and publish image for main branch or tag push event env: @@ -54,7 +54,7 @@ jobs: --build-arg name=app \ --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.description=aai image" \ --label "org.opencontainers.image.licenses=Apache" \ --push \ --cache-from=type=local,src=/tmp/.buildx-cache \ @@ -62,54 +62,54 @@ jobs: -t ${DOCKER_REPO_TAGGED} \ -f Dockerfile \ . - push-to-docker-hub: - needs: build-fastgpt-images - runs-on: ubuntu-20.04 - if: github.repository == 'labring/FastGPT' - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_HUB_NAME }} - password: ${{ secrets.DOCKER_HUB_PASSWORD }} - - name: Set DOCKER_REPO_TAGGED based on branch or tag - run: | - if [[ "${{ github.ref_name }}" == "main" ]]; then - echo "IMAGE_TAG=latest" >> $GITHUB_ENV - else - echo "IMAGE_TAG=${{ github.ref_name }}" >> $GITHUB_ENV - fi - - name: Pull image from GitHub Container Registry - run: docker pull ghcr.io/${{ github.repository_owner }}/fastgpt:${{env.IMAGE_TAG}} - - name: Tag image with Docker Hub repository name and version tag - run: docker tag ghcr.io/${{ github.repository_owner }}/fastgpt:${{env.IMAGE_TAG}} ${{ secrets.DOCKER_IMAGE_NAME }}:${{env.IMAGE_TAG}} - - name: Push image to Docker Hub - run: docker push ${{ secrets.DOCKER_IMAGE_NAME }}:${{env.IMAGE_TAG}} - push-to-ali-hub: - needs: build-fastgpt-images - if: github.repository == 'labring/FastGPT' - runs-on: ubuntu-20.04 - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Login to Ali Hub - uses: docker/login-action@v2 - with: - registry: registry.cn-hangzhou.aliyuncs.com - username: ${{ secrets.ALI_HUB_USERNAME }} - password: ${{ secrets.ALI_HUB_PASSWORD }} - - name: Set DOCKER_REPO_TAGGED based on branch or tag - run: | - if [[ "${{ github.ref_name }}" == "main" ]]; then - echo "IMAGE_TAG=latest" >> $GITHUB_ENV - else - echo "IMAGE_TAG=${{ github.ref_name }}" >> $GITHUB_ENV - fi - - name: Pull image from GitHub Container Registry - run: docker pull ghcr.io/${{ github.repository_owner }}/fastgpt:${{env.IMAGE_TAG}} - - name: Tag image with Docker Hub repository name and version tag - run: docker tag ghcr.io/${{ github.repository_owner }}/fastgpt:${{env.IMAGE_TAG}} ${{ secrets.ALI_IMAGE_NAME }}:${{env.IMAGE_TAG}} - - name: Push image to Docker Hub - run: docker push ${{ secrets.ALI_IMAGE_NAME }}:${{env.IMAGE_TAG}} + # push-to-docker-hub: + # needs: build-fastgpt-images + # runs-on: ubuntu-20.04 + # if: github.repository == 'labring/FastGPT' + # steps: + # - name: Checkout code + # uses: actions/checkout@v3 + # - name: Login to Docker Hub + # uses: docker/login-action@v2 + # with: + # username: ${{ secrets.DOCKER_HUB_NAME }} + # password: ${{ secrets.DOCKER_HUB_PASSWORD }} + # - name: Set DOCKER_REPO_TAGGED based on branch or tag + # run: | + # if [[ "${{ github.ref_name }}" == "main" ]]; then + # echo "IMAGE_TAG=latest" >> $GITHUB_ENV + # else + # echo "IMAGE_TAG=${{ github.ref_name }}" >> $GITHUB_ENV + # fi + # - name: Pull image from GitHub Container Registry + # run: docker pull ghcr.io/${{ github.repository_owner }}/fastgpt:${{env.IMAGE_TAG}} + # - name: Tag image with Docker Hub repository name and version tag + # run: docker tag ghcr.io/${{ github.repository_owner }}/fastgpt:${{env.IMAGE_TAG}} ${{ secrets.DOCKER_IMAGE_NAME }}:${{env.IMAGE_TAG}} + # - name: Push image to Docker Hub + # run: docker push ${{ secrets.DOCKER_IMAGE_NAME }}:${{env.IMAGE_TAG}} + # push-to-ali-hub: + # needs: build-fastgpt-images + # if: github.repository == 'labring/FastGPT' + # runs-on: ubuntu-20.04 + # steps: + # - name: Checkout code + # uses: actions/checkout@v3 + # - name: Login to Ali Hub + # uses: docker/login-action@v2 + # with: + # registry: registry.cn-hangzhou.aliyuncs.com + # username: ${{ secrets.ALI_HUB_USERNAME }} + # password: ${{ secrets.ALI_HUB_PASSWORD }} + # - name: Set DOCKER_REPO_TAGGED based on branch or tag + # run: | + # if [[ "${{ github.ref_name }}" == "main" ]]; then + # echo "IMAGE_TAG=latest" >> $GITHUB_ENV + # else + # echo "IMAGE_TAG=${{ github.ref_name }}" >> $GITHUB_ENV + # fi + # - name: Pull image from GitHub Container Registry + # run: docker pull ghcr.io/${{ github.repository_owner }}/fastgpt:${{env.IMAGE_TAG}} + # - name: Tag image with Docker Hub repository name and version tag + # run: docker tag ghcr.io/${{ github.repository_owner }}/fastgpt:${{env.IMAGE_TAG}} ${{ secrets.ALI_IMAGE_NAME }}:${{env.IMAGE_TAG}} + # - name: Push image to Docker Hub + # run: docker push ${{ secrets.ALI_IMAGE_NAME }}:${{env.IMAGE_TAG}} diff --git a/projects/app/src/constants/common.ts b/projects/app/src/constants/common.ts index 4fefa5268bfb..3e042561df54 100644 --- a/projects/app/src/constants/common.ts +++ b/projects/app/src/constants/common.ts @@ -15,7 +15,7 @@ export const htmlTemplate = ` -