This commit is contained in:
archer
2023-06-06 23:26:24 +08:00
parent 7a38a81e12
commit 69bb1f3fa5
2 changed files with 4 additions and 11 deletions

View File

@@ -50,7 +50,6 @@ jobs:
-t ${DOCKER_REPO_TAGGED} \ -t ${DOCKER_REPO_TAGGED} \
-f Dockerfile \ -f Dockerfile \
. .
push-to-docker-hub: push-to-docker-hub:
needs: build-images needs: build-images
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
@@ -70,14 +69,8 @@ jobs:
echo "IMAGE_TAG=${{ github.ref_name }}" >> $GITHUB_ENV echo "IMAGE_TAG=${{ github.ref_name }}" >> $GITHUB_ENV
fi fi
- name: Pull image from GitHub Container Registry - name: Pull image from GitHub Container Registry
env: run: docker pull ghcr.io/${{ github.repository_owner }}/fastgpt:${{env.IMAGE_TAG}}
IMAGE_TAG: ${{ env.IMAGE_TAG }}
run: docker pull ghcr.io/${{ github.repository_owner }}/fastgpt:${ IMAGE_TAG }
- name: Tag image with Docker Hub repository name and version tag - name: Tag image with Docker Hub repository name and version tag
env: run: docker tag ghcr.io/${{ github.repository_owner }}/fastgpt:${{env.IMAGE_TAG}} ${{ secrets.DOCKER_IMAGE_NAME }}:${{env.IMAGE_TAG}}
IMAGE_TAG: ${{ env.IMAGE_TAG }}
run: docker tag ghcr.io/${{ github.repository_owner }}/fastgpt:${ IMAGE_TAG } ${{ secrets.DOCKER_IMAGE_NAME }}:${ IMAGE_TAG }
- name: Push image to Docker Hub - name: Push image to Docker Hub
env: run: docker push ${{ secrets.DOCKER_IMAGE_NAME }}:${{env.IMAGE_TAG}}
IMAGE_TAG: ${{ env.IMAGE_TAG }}
run: docker push ${{ secrets.DOCKER_IMAGE_NAME }}:${ IMAGE_TAG }

View File

@@ -69,7 +69,7 @@ const SelectFileModal = ({
chunks: [] chunks: []
}); });
const { openConfirm, ConfirmChild } = useConfirm({ const { openConfirm, ConfirmChild } = useConfirm({
content: `确认导入该文件,需要一定时间进行拆解,该任务无法终止!QA 拆分仅能使用余额,如果余额不足,未完成的任务会被直接清除。一共 ${ content: `确认导入该文件,需要一定时间进行拆解,该任务无法终止!如果余额不足,未完成的任务会被暂停。一共 ${
splitRes.chunks.length splitRes.chunks.length
} 组。${splitRes.price ? `大约 ${splitRes.price} 元。` : ''}` } 组。${splitRes.price ? `大约 ${splitRes.price} 元。` : ''}`
}); });