From 5cb3fe777cddba644d3eb2857ee0e78aebd4641c Mon Sep 17 00:00:00 2001 From: XXXXRT666 <157766680+XXXXRT666@users.noreply.github.com> Date: Thu, 1 May 2025 00:46:33 +0100 Subject: [PATCH] fix bug --- Docker/setup.sh | 5 +++++ Dockerfile | 16 +++++++++------- docker-compose.yaml | 12 ++++++------ 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Docker/setup.sh b/Docker/setup.sh index 097746dc..28dab49c 100644 --- a/Docker/setup.sh +++ b/Docker/setup.sh @@ -62,6 +62,11 @@ else exit 1 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/ + pip cache purge pip show torch diff --git a/Dockerfile b/Dockerfile index ddefd9b0..371fe032 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,9 +44,6 @@ ENV HOME="/root" RUN bash Docker/anaconda_install.sh -RUN echo "== $HOME/anaconda3/pkgs ==" && du -h --max-depth=2 $HOME/anaconda3/pkgs | sort -hr | head -n 10 && \ - echo "== $HOME/anaconda3 ==" && du -h --max-depth=2 $HOME/anaconda3 | sort -hr | head -n 10 - ENV PATH="$HOME/anaconda3/bin:$PATH" SHELL ["/bin/bash", "-c"] @@ -57,11 +54,16 @@ ENV MAKEFLAGS="-j$(nproc)" RUN bash Docker/setup.sh -RUN echo "== $HOME/anaconda3/pkgs ==" && du -h --max-depth=2 $HOME/anaconda3/pkgs | sort -hr | head -n 10 && \ - echo "== $HOME/anaconda3 ==" && du -h --max-depth=2 $HOME/anaconda3 | sort -hr | head -n 10 - EXPOSE 9871 9872 9873 9874 9880 ENV PYTHONPATH="/workspace/GPT-SoVITS" -CMD ["/bin/bash", "-c", "source $HOME/anaconda3/etc/profile.d/conda.sh && exec bash"] \ No newline at end of file +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 && \ + exec bash"] \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index f05c4e23..28ef3a63 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -12,9 +12,9 @@ services: - "9880:9880" volumes: - .:/workspace/GPT-SoVITS - - /workspace/GPT-SoVITS/pretrained_models - - /workspace/tools/asr/models - - /workspace/tools/uvr5/uvr5_weights + - /dev/null:/workspace/GPT-SoVITS/pretrained_models + - /dev/null:/workspace/tools/asr/models + - /dev/null:/workspace/tools/uvr5/uvr5_weights environment: - is_half=true tty: true @@ -33,9 +33,9 @@ services: - "9880:9880" volumes: - .:/workspace/GPT-SoVITS - - /workspace/GPT-SoVITS/pretrained_models - - /workspace/tools/asr/models - - /workspace/tools/uvr5/uvr5_weights + - /dev/null:/workspace/GPT-SoVITS/pretrained_models + - /dev/null:/workspace/tools/asr/models + - /dev/null:/workspace/tools/uvr5/uvr5_weights environment: - is_half=true tty: true