From 10603e0d22d610a54144dad62991f2a34b799dc4 Mon Sep 17 00:00:00 2001 From: XXXXRT666 <157766680+XXXXRT666@users.noreply.github.com> Date: Tue, 29 Apr 2025 19:41:24 +0100 Subject: [PATCH] Fix Bugs --- .github/workflows/docker-publish.yaml | 4 ++-- Dockerfile | 2 +- docker_build.sh | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 22985463..cb83a2c7 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -37,7 +37,7 @@ jobs: USE_FUNASR=true USE_FASTERWHISPER=false CUDA_VERSION=12.4 - WGET_CMD="wget -nv --tries=25 --wait=5 --read-timeout=40 --retry-on-http-error=404" + WGET_CMD=wget -nv --tries=25 --wait=5 --read-timeout=40 --retry-on-http-error=404 tags: | xxxxrt666/gpt-sovits:lite-cu124-${{ steps.meta.outputs.tag }} xxxxrt666/gpt-sovits:latest-lite @@ -54,7 +54,7 @@ jobs: USE_FUNASR=true USE_FASTERWHISPER=true CUDA_VERSION=12.4 - WGET_CMD="wget -nv --tries=25 --wait=5 --read-timeout=40 --retry-on-http-error=404" + WGET_CMD=wget -nv --tries=25 --wait=5 --read-timeout=40 --retry-on-http-error=404 tags: | xxxxrt666/gpt-sovits:cu124-${{ steps.meta.outputs.tag }} xxxxrt666/gpt-sovits:latest diff --git a/Dockerfile b/Dockerfile index cd8962ee..aa0b7fd7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ WORKDIR /workspace/GPT-SoVITS COPY . /workspace/GPT-SoVITS -ARG WGET_CMD="wget --tries=25 --wait=5 --read-timeout=40 --retry-on-http-error=404" +ARG WGET_CMD RUN eval "$WGET_CMD -O anaconda.sh https://repo.anaconda.com/archive/Anaconda3-2024.10-1-Linux-x86_64.sh" && \ bash anaconda.sh -b -p /root/anaconda3 && \ diff --git a/docker_build.sh b/docker_build.sh index 212c8d1b..6f13cd4f 100644 --- a/docker_build.sh +++ b/docker_build.sh @@ -16,6 +16,7 @@ trap 'echo "Error Occured at \"$BASH_COMMAND\" with exit code $?"; exit 1' ERR USE_FUNASR=false USE_FASTERWHISPER=false CUDA_VERSION=12.4 +WGET_CMD="wget --tries=25 --wait=5 --read-timeout=40 --retry-on-http-error=404" print_help() { echo "Usage: bash docker_build.sh [OPTIONS]" @@ -78,5 +79,6 @@ docker build \ --build-arg CUDA_VERSION=$CUDA_VERSION \ --build-arg USE_FUNASR=$USE_FUNASR \ --build-arg USE_FASTERWHISPER=$USE_FASTERWHISPER \ + --build-arg WGET_CMD="$WGET_CMD" \ -t "${USER}/gpt-sovits:local" \ .