From 1c780def2efe822f0593409042be24d09a0418d0 Mon Sep 17 00:00:00 2001
From: XXXXRT666 <157766680+XXXXRT666@users.noreply.github.com>
Date: Thu, 1 May 2025 02:29:57 +0100
Subject: [PATCH] Fix pre-commit.ci and Docker

---
 .pre-commit-config.yaml |  4 ++--
 Docker/setup.sh         |  6 +++---
 Dockerfile              | 12 ++++++------
 docker_build.sh         |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 31a27a15..ce29fa73 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,11 +8,11 @@ repos:
     # Run the linter.
     - id: ruff
       types_or: [ python, pyi ]
-      args: [ --fix ]
+      args: [ --fix, --exit-zero ]
     # Run the formatter.
     - id: ruff-format
       types_or: [ python, pyi ]
-      args: [--line-length=120]
+      args: [ --line-length=120, --target-version py310 ]
 
 - repo: https://github.com/codespell-project/codespell
   rev: v2.4.1
diff --git a/Docker/setup.sh b/Docker/setup.sh
index 28dab49c..9653be42 100644
--- a/Docker/setup.sh
+++ b/Docker/setup.sh
@@ -63,9 +63,9 @@ else
 fi
 
 mkdir -p /workspace/model
-mv /workspace/GPT-SoVITS/pretrained_models /workspace/model/
-mv /workspace/tools/asr/models /workspace/model/
-mv /workspace/tools/uvr5/uvr5_weights /workspace/model/
+mv /workspace/GPT-SoVITS/GPT_SoVITS/pretrained_models /workspace/model/
+mv /workspace/GPT-SoVITS/tools/asr/models /workspace/model/
+mv /workspace/GPT-SoVITS/tools/uvr5/uvr5_weights /workspace/model/
 
 pip cache purge
 
diff --git a/Dockerfile b/Dockerfile
index 9b995329..70e27808 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,10 +61,10 @@ ENV PYTHONPATH="/workspace/GPT-SoVITS"
 
 CMD ["/bin/bash", "-c", "\
   source $HOME/anaconda3/etc/profile.d/conda.sh && \
-  rm -rf /workspace/GPT-SoVITS/pretrained_models && \
-  rm -rf /workspace/tools/asr/models && \
-  rm -rf /workspace/tools/uvr5/uvr5_weights && \
-  ln -s /workspace/model/pretrained_models /workspace/GPT-SoVITS/pretrained_models && \
-  ln -s /workspace/model/models /workspace/tools/asr/models && \
-  ln -s /workspace/model/uvr5_weights /workspace/tools/uvr5/uvr5_weights && \
+  rm -rf /workspace/GPT-SoVITS/GPT_SoVITS/pretrained_models && \
+  rm -rf /workspace/GPT-SoVITS/tools/asr/models && \
+  rm -rf /workspace/GPT-SoVITS/tools/uvr5/uvr5_weights && \
+  ln -s /workspace/model/pretrained_models /workspace/GPT-SoVITS/GPT_SoVITS/pretrained_models && \
+  ln -s /workspace/model/models /workspace/GPT-SoVITS/tools/asr/models && \
+  ln -s /workspace/model/uvr5_weights /workspace/GPT-SoVITS/tools/uvr5/uvr5_weights && \
   exec bash"]
\ No newline at end of file
diff --git a/docker_build.sh b/docker_build.sh
index 8aa9a063..d156fd85 100644
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -65,7 +65,7 @@ while [[ $# -gt 0 ]]; do
     esac
 done
 
-TARGETPLATFORM=$(uname -m | grep -q 'x86_64' && echo "linux/amd64" || echo "linux/arm64")
+TARGETPLATFORM=$(uname -m | grep -q 'x86' && echo "linux/amd64" || echo "linux/arm64")
 
 if [ $LITE = true ]; then
     CUDA_BASE="runtime"