diff --git a/.github/workflows/build-sandbox-image.yml b/.github/workflows/build-sandbox-image.yml index f84c3785d..a1a745a1f 100644 --- a/.github/workflows/build-sandbox-image.yml +++ b/.github/workflows/build-sandbox-image.yml @@ -1,4 +1,4 @@ -name: Build fastgpt-sandbox images and copy image to docker hub +name: Build fastgpt-sandbox images on: workflow_dispatch: push: diff --git a/.github/workflows/fastgpt-image.yml b/.github/workflows/fastgpt-image.yml index fdf652d00..289553070 100644 --- a/.github/workflows/fastgpt-image.yml +++ b/.github/workflows/fastgpt-image.yml @@ -1,4 +1,4 @@ -name: Build FastGPT images and copy image to docker hub +name: Build FastGPT images on: workflow_dispatch: push: @@ -90,26 +90,67 @@ jobs: -t ${Docker_Hub_Tag} \ -t ${Docker_Hub_Latest} \ . - build-fastgpt-images-child-route: + build-fastgpt-images-sub-route: runs-on: ubuntu-20.04 steps: + # install env + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 1 + - name: Install Dependencies + run: | + sudo apt update && sudo apt install -y nodejs npm + - name: Set up QEMU (optional) + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + driver-opts: network=host + - name: Cache Docker layers + uses: actions/cache@v2 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + + # login docker + - name: Login to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GH_PAT }} + - 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: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_HUB_NAME }} + password: ${{ secrets.DOCKER_HUB_PASSWORD }} + # Set tag - name: Set image name and tag run: | if [[ "${{ github.ref_name }}" == "main" ]]; then - echo "Git_Tag=ghcr.io/${{ github.repository_owner }}/fastgpt-child-route:latest" >> $GITHUB_ENV - echo "Git_Latest=ghcr.io/${{ github.repository_owner }}/fastgpt-child-route:latest" >> $GITHUB_ENV - echo "Ali_Tag=${{ secrets.ALI_IMAGE_NAME }}/fastgpt-child-route:latest" >> $GITHUB_ENV - echo "Ali_Latest=${{ secrets.ALI_IMAGE_NAME }}/fastgpt-child-route:latest" >> $GITHUB_ENV - echo "Docker_Hub_Tag=${{ secrets.DOCKER_IMAGE_NAME }}/fastgpt-child-route:latest" >> $GITHUB_ENV - echo "Docker_Hub_Latest=${{ secrets.DOCKER_IMAGE_NAME }}/fastgpt-child-route:latest" >> $GITHUB_ENV + echo "Git_Tag=ghcr.io/${{ github.repository_owner }}/fastgpt-sub-route:latest" >> $GITHUB_ENV + echo "Git_Latest=ghcr.io/${{ github.repository_owner }}/fastgpt-sub-route:latest" >> $GITHUB_ENV + echo "Ali_Tag=${{ secrets.ALI_IMAGE_NAME }}/fastgpt-sub-route:latest" >> $GITHUB_ENV + echo "Ali_Latest=${{ secrets.ALI_IMAGE_NAME }}/fastgpt-sub-route:latest" >> $GITHUB_ENV + echo "Docker_Hub_Tag=${{ secrets.DOCKER_IMAGE_NAME }}/fastgpt-sub-route:latest" >> $GITHUB_ENV + echo "Docker_Hub_Latest=${{ secrets.DOCKER_IMAGE_NAME }}/fastgpt-sub-route:latest" >> $GITHUB_ENV else - echo "Git_Tag=ghcr.io/${{ github.repository_owner }}/fastgpt-child-route:${{ github.ref_name }}" >> $GITHUB_ENV - echo "Git_Latest=ghcr.io/${{ github.repository_owner }}/fastgpt-child-route:latest" >> $GITHUB_ENV - echo "Ali_Tag=${{ secrets.ALI_IMAGE_NAME }}/fastgpt-child-route:${{ github.ref_name }}" >> $GITHUB_ENV - echo "Ali_Latest=${{ secrets.ALI_IMAGE_NAME }}/fastgpt-child-route:latest" >> $GITHUB_ENV - echo "Docker_Hub_Tag=${{ secrets.DOCKER_IMAGE_NAME }}/fastgpt-child-route:${{ github.ref_name }}" >> $GITHUB_ENV - echo "Docker_Hub_Latest=${{ secrets.DOCKER_IMAGE_NAME }}/fastgpt-child-route:latest" >> $GITHUB_ENV + echo "Git_Tag=ghcr.io/${{ github.repository_owner }}/fastgpt-sub-route:${{ github.ref_name }}" >> $GITHUB_ENV + echo "Git_Latest=ghcr.io/${{ github.repository_owner }}/fastgpt-sub-route:latest" >> $GITHUB_ENV + echo "Ali_Tag=${{ secrets.ALI_IMAGE_NAME }}/fastgpt-sub-route:${{ github.ref_name }}" >> $GITHUB_ENV + echo "Ali_Latest=${{ secrets.ALI_IMAGE_NAME }}/fastgpt-sub-route:latest" >> $GITHUB_ENV + echo "Docker_Hub_Tag=${{ secrets.DOCKER_IMAGE_NAME }}/fastgpt-sub-route:${{ github.ref_name }}" >> $GITHUB_ENV + echo "Docker_Hub_Latest=${{ secrets.DOCKER_IMAGE_NAME }}/fastgpt-sub-route:latest" >> $GITHUB_ENV fi - name: Build and publish image for main branch or tag push event @@ -119,7 +160,7 @@ jobs: docker buildx build \ -f projects/app/Dockerfile \ --platform linux/amd64,linux/arm64 \ - --build-arg base_url=fastai \ + --build-arg base_url=fastai \ --label "org.opencontainers.image.source=https://github.com/${{ github.repository_owner }}/FastGPT" \ --label "org.opencontainers.image.description=fastgpt image" \ --push \ diff --git a/docSite/content/zh-cn/docs/development/upgrading/4813.md b/docSite/content/zh-cn/docs/development/upgrading/4813.md index deab3ecb4..dbe6f6f2e 100644 --- a/docSite/content/zh-cn/docs/development/upgrading/4813.md +++ b/docSite/content/zh-cn/docs/development/upgrading/4813.md @@ -39,5 +39,5 @@ weight: 811 14. 优化 - 工作流上下文拆分,性能优化。 15. 优化 - 语音播报,不支持 mediaSource 的浏览器可等待完全生成语音后输出。 16. 修复 - Dockerfile pnpm install 支持代理。 -17. 修复 - BI 图表生成无法写入文件。 +17. 修复 - BI 图表生成无法写入文件。同时优化其解析,支持数字类型数组。 18. 修复 - 分享链接首次加载时,标题显示不正确。 diff --git a/packages/plugins/src/databaseConnection/template.json b/packages/plugins/src/databaseConnection/template.json index c4561019d..6aaa4cbf3 100644 --- a/packages/plugins/src/databaseConnection/template.json +++ b/packages/plugins/src/databaseConnection/template.json @@ -1,7 +1,7 @@ { - "author": "", + "author": "silencezhang", "version": "4811", - "name": "数据源配置", + "name": "数据库连接", "avatar": "core/workflow/template/datasource", "intro": "可连接常用数据库,并执行sql", "showStatus": true, diff --git a/packages/plugins/src/drawing/baseChart/template.json b/packages/plugins/src/drawing/baseChart/template.json index 5ff6013ea..c249ced14 100644 --- a/packages/plugins/src/drawing/baseChart/template.json +++ b/packages/plugins/src/drawing/baseChart/template.json @@ -1,5 +1,5 @@ { - "author": "", + "author": "silencezhang", "version": "4812", "name": "基础图表", "avatar": "core/workflow/template/baseChart", diff --git a/packages/plugins/src/drawing/template.json b/packages/plugins/src/drawing/template.json index d7ec486b3..62a4b1297 100644 --- a/packages/plugins/src/drawing/template.json +++ b/packages/plugins/src/drawing/template.json @@ -1,5 +1,5 @@ { - "author": "silencezhang7", + "author": "silencezhang", "version": "486", "name": "BI图表功能", "avatar": "core/workflow/template/BI",