diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 355e0108..7422031c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -150,20 +150,6 @@ jobs: cache: false - name: Dependencies run: | - ## XXX: This is a workaround to fix the build failure due to the network issues - # Configure apt to use French mirrors and add retry logic - echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries - echo 'Acquire::http::Timeout "120";' | sudo tee -a /etc/apt/apt.conf.d/80-retries - echo 'Acquire::https::Timeout "120";' | sudo tee -a /etc/apt/apt.conf.d/80-retries - echo 'Acquire::ftp::Timeout "120";' | sudo tee -a /etc/apt/apt.conf.d/80-retries - - # Add French mirrors - echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse' | sudo tee /etc/apt/sources.list - echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list - echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list - echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list - ## END of workaround - sudo apt-get update sudo apt-get install -y wget curl build-essential ffmpeg protobuf-compiler ccache upx-ucl gawk cmake libgmock-dev make install-go-tools diff --git a/Dockerfile b/Dockerfile index ce63b07c..5dadfe4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,20 +17,6 @@ ARG TARGETVARIANT ENV DEBIAN_FRONTEND=noninteractive ENV EXTERNAL_GRPC_BACKENDS="coqui:/build/backend/python/coqui/run.sh,transformers:/build/backend/python/transformers/run.sh,rerankers:/build/backend/python/rerankers/run.sh,bark:/build/backend/python/bark/run.sh,diffusers:/build/backend/python/diffusers/run.sh,faster-whisper:/build/backend/python/faster-whisper/run.sh,kokoro:/build/backend/python/kokoro/run.sh,vllm:/build/backend/python/vllm/run.sh,exllama2:/build/backend/python/exllama2/run.sh,chatterbox:/build/backend/python/chatterbox/run.sh" -## XXX: This is a workaround to fix the build failure due to the network issues -# Add retry logic for apt-get -RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \ - echo 'Acquire::http::Timeout "120";' >> /etc/apt/apt.conf.d/80-retries && \ - echo 'Acquire::https::Timeout "120";' >> /etc/apt/apt.conf.d/80-retries && \ - echo 'Acquire::ftp::Timeout "120";' >> /etc/apt/apt.conf.d/80-retries - -# Add multiple mirrors to distribute load -RUN echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse' >> /etc/apt/sources.list && \ - echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse' >> /etc/apt/sources.list && \ - echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse' >> /etc/apt/sources.list && \ - echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse' >> /etc/apt/sources.list -## END of workaround - RUN apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \