From 756e0e3a9f0ad4a77b1c39dd59f959721c6cbb67 Mon Sep 17 00:00:00 2001 From: XXXXRT666 <157766680+XXXXRT666@users.noreply.github.com> Date: Wed, 30 Apr 2025 22:46:31 +0100 Subject: [PATCH] fix bugs --- .github/workflows/docker-publish.yaml | 8 ++++---- Docker/setup.sh | 4 +--- docker_build.sh | 5 ++++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 1f6aa35f..20dcea89 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -26,16 +26,16 @@ jobs: matrix: include: - cuda_version: 12.4 - lite: false + lite: true tag_prefix: lite-cu124 - cuda_version: 12.4 - lite: true + lite: false tag_prefix: cu124 - cuda_version: 12.8 - lite: false + lite: true tag_prefix: lite-cu128 - cuda_version: 12.8 - lite: true + lite: false tag_prefix: cu128 steps: diff --git a/Docker/setup.sh b/Docker/setup.sh index 55ef884c..14f4d8f2 100644 --- a/Docker/setup.sh +++ b/Docker/setup.sh @@ -50,9 +50,7 @@ source "$HOME/anaconda3/etc/profile.d/conda.sh" conda config --add channels conda-forge -conda config --set channel_priority strict - -conda install -n base -c conda-forge conda=25.3.1 +conda update --all -y if [ "$LITE" = "true" ]; then bash install.sh --device "CU${CUDA_VERSION//./}" --source HF diff --git a/docker_build.sh b/docker_build.sh index 28e731ae..ea4960cd 100644 --- a/docker_build.sh +++ b/docker_build.sh @@ -65,8 +65,11 @@ while [[ $# -gt 0 ]]; do esac done +TARGETPLATFORM=$(uname -m | grep -q 'x86_64' && echo "linux/amd64" || echo "linux/arm64") + docker build \ --build-arg CUDA_VERSION=$CUDA_VERSION \ --build-arg LITE=$LITE \ - -t "${USER}/gpt-sovits:local" \ + --build-arg TARGETPLATFORM="$TARGETPLATFORM" +-t "${USER}/gpt-sovits:local" \ .