remove ghcr & update docker registry

fishaudio · Sep 15, 2024 · 4f097ef · wojiushixiaobai · Sep 15, 2024 · leng-yue
1 parent b807a7f
commit 4f097ef
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 90 deletions.
diff --git a/.github/workflows/build-docker-image.yml b/.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

diff --git a/.github/workflows/build-windows-package.yml b/.github/workflows/build-windows-package.yml
diff --git a/README.ja.md b/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"/>

diff --git a/README.md b/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"/>

diff --git a/README.pt-BR.md b/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"/>

diff --git a/README.zh.md b/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"/>

diff --git a/docs/en/index.md b/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>
 

diff --git a/docs/ja/index.md b/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>
 

diff --git a/docs/pt/index.md b/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>
 

diff --git a/docs/zh/index.md b/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
     ```

diff --git a/mkdocs.yml b/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