فهرست منبع

remove ghcr & update docker registry

Lengyue 1 سال پیش
والد
کامیت
4f097ef2f4
11فایلهای تغییر یافته به همراه28 افزوده شده و 90 حذف شده
  1. 9 20
      .github/workflows/build-docker-image.yml
  2. 0 51
      .github/workflows/build-windows-package.yml
  3. 2 2
      README.ja.md
  4. 2 2
      README.md
  5. 2 2
      README.pt-BR.md
  6. 2 2
      README.zh.md
  7. 2 2
      docs/en/index.md
  8. 2 2
      docs/ja/index.md
  9. 2 2
      docs/pt/index.md
  10. 4 4
      docs/zh/index.md
  11. 1 1
      mkdocs.yml

+ 9 - 20
.github/workflows/build-docker-image.yml

@@ -17,20 +17,13 @@ jobs:
       - name: Get Version
         run: |
           if [[ $GITHUB_REF == refs/tags/v* ]]; then
-            echo "version=$(basename ${GITHUB_REF})" >> $GITHUB_ENV
+            version=$(basename ${GITHUB_REF})
           else
             version=dev
-            echo "version=${version}" >> $GITHUB_ENV
           fi
 
-          echo "Current version: ${{ env.version }}"
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          echo "version=${version}" >> $GITHUB_ENV
+          echo "Current version: ${version}"
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -46,15 +39,13 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner }}/fish-speech:${{ env.version }}
-            ghcr.io/${{ github.repository_owner }}/fish-speech:latest
             fishaudio/fish-speech:${{ env.version }}
             fishaudio/fish-speech:latest
           outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=registry,ref=fishaudio/fish-speech:latest
+          cache-to: type=inline
 
-      - name: Build and Push Debug Image
+      - name: Build and Push Dev Image
         uses: docker/build-push-action@v6
         with:
           context: .
@@ -63,15 +54,13 @@ jobs:
           push: true
           build-args: |
             VERSION=${{ env.version }}
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/fish-speech:${{ env.version }}
+            BASE_IMAGE=fishaudio/fish-speech:${{ env.version }}
           tags: |
-            ghcr.io/${{ github.repository_owner }}/fish-speech:${{ env.version }}-dev
-            ghcr.io/${{ github.repository_owner }}/fish-speech:latest-dev
             fishaudio/fish-speech:${{ env.version }}-dev
             fishaudio/fish-speech:latest-dev
           outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=registry,ref=fishaudio/fish-speech:latest-dev
+          cache-to: type=inline
 
       - name: Push README to Dockerhub
         uses: christian-korneck/update-container-description-action@v1

+ 0 - 51
.github/workflows/build-windows-package.yml

@@ -1,51 +0,0 @@
-name: build-windows-package
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Remove unnecessary files
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf /usr/local/lib/android
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-      - uses: actions/setup-python@v5
-        with:
-          python-version: 3.12
-      - uses: actions/checkout@v4
-        with:
-          path: ./fish-speech
-      - name: Setup Hugging Face CLI
-        run: pip3 install huggingface-hub
-      - name: Download Windows Binaries
-        env:
-          HF_TOKEN: ${{ secrets.HF_TOKEN }}
-        run: |
-          if [[ "${{ github.actor }}" = "Leng Yue" ]] || [[ "${{ github.actor }}" = "AnyaCoder" ]] || [[ "${{ github.actor }}" = "pre-commit-ci[bot]" ]]; then
-            ls -la
-          else
-            echo "Author is not Leng Yue nor AnyaCoder. No upload performed."
-          fi
-      - uses: actions/upload-artifact@v4
-        with:
-          name: fish-speech-main-${{ github.run_id }}
-          path: ./fish-speech
-
-      - name: Upload to Hugging Face
-        env:
-          HF_TOKEN: ${{ secrets.HF_TOKEN }}
-        run: |
-          if [ "${{ github.actor }}" = "NoNeedToUpload" ]; then
-            echo "Author is AnyaCoder. Performing the zipping && upload."
-            zip -qr fish-speech-main-${{ github.run_id }}.zip ./fish-speech
-            huggingface-cli upload SpicyqSama007/fish-speech-packed ./fish-speech-main-${{ github.run_id }}.zip fish-speech-main-${{ github.run_id }}.zip
-          else
-            echo "Author is not AnyaCoder. No upload performed."
-          fi

+ 2 - 2
README.ja.md

@@ -14,8 +14,8 @@
 <a target="_blank" href="https://discord.gg/Es5qTB9BcN">
 <img alt="Discord" src="https://img.shields.io/discord/1214047546020728892?color=%23738ADB&label=Discord&logo=discord&logoColor=white&style=flat-square"/>
 </a>
-<a target="_blank" href="https://hub.docker.com/r/lengyue233/fish-speech">
-<img alt="Docker" src="https://img.shields.io/docker/pulls/lengyue233/fish-speech?style=flat-square&logo=docker"/>
+<a target="_blank" href="https://hub.docker.com/r/fishaudio/fish-speech">
+<img alt="Docker" src="https://img.shields.io/docker/pulls/fishaudio/fish-speech?style=flat-square&logo=docker"/>
 </a>
 <a target="_blank" href="https://github.com/fishaudio/fish-speech/actions/workflows/build-windows-package.yml">
 <img alt="Action" src="https://img.shields.io/github/actions/workflow/status/fishaudio/fish-speech/build-windows-package.yml?style=flat-square&label=Build%20Windows%20Package&logo=github"/>

+ 2 - 2
README.md

@@ -14,8 +14,8 @@
 <a target="_blank" href="https://discord.gg/Es5qTB9BcN">
 <img alt="Discord" src="https://img.shields.io/discord/1214047546020728892?color=%23738ADB&label=Discord&logo=discord&logoColor=white&style=flat-square"/>
 </a>
-<a target="_blank" href="https://hub.docker.com/r/lengyue233/fish-speech">
-<img alt="Docker" src="https://img.shields.io/docker/pulls/lengyue233/fish-speech?style=flat-square&logo=docker"/>
+<a target="_blank" href="https://hub.docker.com/r/fishaudio/fish-speech">
+<img alt="Docker" src="https://img.shields.io/docker/pulls/fishaudio/fish-speech?style=flat-square&logo=docker"/>
 </a>
 <a target="_blank" href="https://github.com/fishaudio/fish-speech/actions/workflows/build-windows-package.yml">
 <img alt="Action" src="https://img.shields.io/github/actions/workflow/status/fishaudio/fish-speech/build-windows-package.yml?style=flat-square&label=Build%20Windows%20Package&logo=github"/>

+ 2 - 2
README.pt-BR.md

@@ -10,8 +10,8 @@
 <a target="_blank" href="https://discord.gg/Es5qTB9BcN">
 <img alt="Discord" src="https://img.shields.io/discord/1214047546020728892?color=%23738ADB&label=Discord&logo=discord&logoColor=white&style=flat-square"/>
 </a>
-<a target="_blank" href="https://hub.docker.com/r/lengyue233/fish-speech">
-<img alt="Docker" src="https://img.shields.io/docker/pulls/lengyue233/fish-speech?style=flat-square&logo=docker"/>
+<a target="_blank" href="https://hub.docker.com/r/fishaudio/fish-speech">
+<img alt="Docker" src="https://img.shields.io/docker/pulls/fishaudio/fish-speech?style=flat-square&logo=docker"/>
 </a>
 <a target="_blank" href="https://github.com/fishaudio/fish-speech/actions/workflows/build-windows-package.yml">
 <img alt="Action" src="https://img.shields.io/github/actions/workflow/status/fishaudio/fish-speech/build-windows-package.yml?style=flat-square&label=Build%20Windows%20Package&logo=github"/>

+ 2 - 2
README.zh.md

@@ -13,8 +13,8 @@
 <a target="_blank" href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=jCKlUP7QgSm9kh95UlBoYv6s1I-Apl1M&authKey=xI5ttVAp3do68IpEYEalwXSYZFdfxZSkah%2BctF5FIMyN2NqAa003vFtLqJyAVRfF&noverify=0&group_code=593946093">
 <img alt="QQ" src="https://img.shields.io/badge/QQ Group-%2312B7F5?logo=tencent-qq&logoColor=white&style=flat-square"/>
 </a>
-<a target="_blank" href="https://hub.docker.com/r/lengyue233/fish-speech">
-<img alt="Docker" src="https://img.sh.io/docker/pulls/lengyue233/fish-speech?style=flat-square&logo=docker"/>
+<a target="_blank" href="https://hub.docker.com/r/fishaudio/fish-speech">
+<img alt="Docker" src="https://img.sh.io/docker/pulls/fishaudio/fish-speech?style=flat-square&logo=docker"/>
 </a>
 <a target="_blank" href="https://github.com/fishaudio/fish-speech/actions/workflows/build-windows-package.yml">
 <img alt="Action" src="https://img.shields.io/github/actions/workflow/status/fishaudio/fish-speech/build-windows-package.yml?style=flat-square&label=Build%20Windows%20Package&logo=github"/>

+ 2 - 2
docs/en/index.md

@@ -7,8 +7,8 @@
 <a target="_blank" href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=jCKlUP7QgSm9kh95UlBoYv6s1I-Apl1M&authKey=xI5ttVAp3do68IpEYEalwXSYZFdfxZSkah%2BctF5FIMyN2NqAa003vFtLqJyAVRfF&noverify=0&group_code=593946093">
 <img alt="QQ" src="https://img.shields.io/badge/QQ Group-%2312B7F5?logo=tencent-qq&logoColor=white&style=flat-square"/>
 </a>
-<a target="_blank" href="https://hub.docker.com/r/lengyue233/fish-speech">
-<img alt="Docker" src="https://img.shields.io/docker/pulls/lengyue233/fish-speech?style=flat-square&logo=docker"/>
+<a target="_blank" href="https://hub.docker.com/r/fishaudio/fish-speech">
+<img alt="Docker" src="https://img.shields.io/docker/pulls/fishaudio/fish-speech?style=flat-square&logo=docker"/>
 </a>
 </div>
 

+ 2 - 2
docs/ja/index.md

@@ -7,8 +7,8 @@
 <a target="_blank" href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=jCKlUP7QgSm9kh95UlBoYv6s1I-Apl1M&authKey=xI5ttVAp3do68IpEYEalwXSYZFdfxZSkah%2BctF5FIMyN2NqAa003vFtLqJyAVRfF&noverify=0&group_code=593946093">
 <img alt="QQ" src="https://img.shields.io/badge/QQ Group-%2312B7F5?logo=tencent-qq&logoColor=white&style=flat-square"/>
 </a>
-<a target="_blank" href="https://hub.docker.com/r/lengyue233/fish-speech">
-<img alt="Docker" src="https://img.shields.io/docker/pulls/lengyue233/fish-speech?style=flat-square&logo=docker"/>
+<a target="_blank" href="https://hub.docker.com/r/fishaudio/fish-speech">
+<img alt="Docker" src="https://img.shields.io/docker/pulls/fishaudio/fish-speech?style=flat-square&logo=docker"/>
 </a>
 </div>
 

+ 2 - 2
docs/pt/index.md

@@ -7,8 +7,8 @@
 <a target="_blank" href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=jCKlUP7QgSm9kh95UlBoYv6s1I-Apl1M&authKey=xI5ttVAp3do68IpEYEalwXSYZFdfxZSkah%2BctF5FIMyN2NqAa003vFtLqJyAVRfF&noverify=0&group_code=593946093">
 <img alt="QQ" src="https://img.shields.io/badge/QQ Group-%2312B7F5?logo=tencent-qq&logoColor=white&style=flat-square"/>
 </a>
-<a target="_blank" href="https://hub.docker.com/r/lengyue233/fish-speech">
-<img alt="Docker" src="https://img.shields.io/docker/pulls/lengyue233/fish-speech?style=flat-square&logo=docker"/>
+<a target="_blank" href="https://hub.docker.com/r/fishaudio/fish-speech">
+<img alt="Docker" src="https://img.shields.io/docker/pulls/fishaudio/fish-speech?style=flat-square&logo=docker"/>
 </a>
 </div>
 

+ 4 - 4
docs/zh/index.md

@@ -7,8 +7,8 @@
 <a target="_blank" href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=jCKlUP7QgSm9kh95UlBoYv6s1I-Apl1M&authKey=xI5ttVAp3do68IpEYEalwXSYZFdfxZSkah%2BctF5FIMyN2NqAa003vFtLqJyAVRfF&noverify=0&group_code=593946093">
 <img alt="QQ" src="https://img.shields.io/badge/QQ Group-%2312B7F5?logo=tencent-qq&logoColor=white&style=flat-square"/>
 </a>
-<a target="_blank" href="https://hub.docker.com/r/lengyue233/fish-speech">
-<img alt="Docker" src="https://img.shields.io/docker/pulls/lengyue233/fish-speech?style=flat-square&logo=docker"/>
+<a target="_blank" href="https://hub.docker.com/r/fishaudio/fish-speech">
+<img alt="Docker" src="https://img.shields.io/docker/pulls/fishaudio/fish-speech?style=flat-square&logo=docker"/>
 </a>
 </div>
 
@@ -133,13 +133,13 @@ apt install libsox-dev
 
     ```shell
     # 拉取镜像
-    docker pull lengyue233/fish-speech
+    docker pull fishaudio/fish-speech
     # 运行镜像
     docker run -it \
         --name fish-speech \
         --gpus all \
         -p 7860:7860 \
-        lengyue233/fish-speech \
+        fishaudio/fish-speech \
         zsh
     # 如果需要使用其他端口,请修改 -p 参数为 YourPort:7860
     ```

+ 1 - 1
mkdocs.yml

@@ -103,7 +103,7 @@ extra:
     - icon: fontawesome/brands/discord
       link: https://discord.gg/Es5qTB9BcN
     - icon: fontawesome/brands/docker
-      link: https://hub.docker.com/r/lengyue233/fish-speech
+      link: https://hub.docker.com/r/fishaudio/fish-speech
     - icon: fontawesome/brands/qq
       link: http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=jCKlUP7QgSm9kh95UlBoYv6s1I-Apl1M&authKey=xI5ttVAp3do68IpEYEalwXSYZFdfxZSkah%2BctF5FIMyN2NqAa003vFtLqJyAVRfF&noverify=0&group_code=593946093
   homepage: https://speech.fish.audio