diff --git a/Dockerfile.in b/Dockerfile.in index e9eca6e45..bc4e914ab 100644 --- a/Dockerfile.in +++ b/Dockerfile.in @@ -24,6 +24,14 @@ ENV CPPFLAGS="-I${TARGET_DIR}/include $CPPFLAGS" ENV CFLAGS="-I${TARGET_DIR}/include $CFLAGS" ENV CMAKE_POLICY_VERSION_MINIMUM="3.5" +# Use more reliable mirrors for Ubuntu packages +RUN mkdir -p /etc/apt/sources.list.d/ \ + && touch /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources \ + && sed -i 's|archive.ubuntu.com/ubuntu/|mirrors.kernel.org/ubuntu/|g' \ + /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources \ + && sed -i 's|security.ubuntu.com/ubuntu/|mirrors.kernel.org/ubuntu/|g' \ + /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources + # Prepare Debian build environment RUN apt-get update \ && apt-get dist-upgrade -y \ diff --git a/Dockerfile.win64.in b/Dockerfile.win64.in index cd5f101a4..4a199ff00 100644 --- a/Dockerfile.win64.in +++ b/Dockerfile.win64.in @@ -23,6 +23,14 @@ ENV DEBIAN_FRONTEND=noninteractive \ DLLTOOL="x86_64-w64-mingw32-dlltool" \ CMAKE_POLICY_VERSION_MINIMUM="3.5" +# Use more reliable mirrors for Ubuntu packages +RUN mkdir -p /etc/apt/sources.list.d/ \ + && touch /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources \ + && sed -i 's|archive.ubuntu.com/ubuntu/|mirrors.kernel.org/ubuntu/|g' \ + /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources \ + && sed -i 's|security.ubuntu.com/ubuntu/|mirrors.kernel.org/ubuntu/|g' \ + /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources + # Prepare Debian and mingw-w64 build environment RUN apt-get update \ && apt-get dist-upgrade -y \ diff --git a/builder/images/base/Dockerfile b/builder/images/base/Dockerfile index 9ecb0cd78..60e373807 100644 --- a/builder/images/base/Dockerfile +++ b/builder/images/base/Dockerfile @@ -1,6 +1,15 @@ FROM ubuntu:noble ENV DEBIAN_FRONTEND=noninteractive + +# Use more reliable mirrors for Ubuntu packages +RUN mkdir -p /etc/apt/sources.list.d/ \ + && touch /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources \ + && sed -i 's|archive.ubuntu.com/ubuntu/|mirrors.kernel.org/ubuntu/|g' \ + /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources \ + && sed -i 's|security.ubuntu.com/ubuntu/|mirrors.kernel.org/ubuntu/|g' \ + /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources + RUN \ apt-get -y update && \ apt-get -y dist-upgrade && \ diff --git a/docker-build.sh b/docker-build.sh index 9b3f59d51..4418dc785 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -6,7 +6,7 @@ set -o errexit set -o xtrace DEBIAN_ADDR=http://deb.debian.org/debian/ -UBUNTU_ARCHIVE_ADDR=http://archive.ubuntu.com/ubuntu/ +UBUNTU_ARCHIVE_ADDR=http://mirrors.kernel.org/ubuntu/ # http://archive.ubuntu.com/ubuntu/ UBUNTU_PORTS_ADDR=http://ports.ubuntu.com/ubuntu-ports/ # Prepare common extra libs for amd64 and arm64