Skip to content

Commit 7f58879

Browse files
committed
docker: use Canonical's Azure apt mirror for arm64
ports.ubuntu.com failed three consecutive CI runs; the Azure mirror is reachable from GitHub runners and the public internet alike.
1 parent b0c1a14 commit 7f58879

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

docker/Dockerfile.builder

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ FROM ubuntu:22.04
33
ARG FFMPEG_COMMIT=998de74adf861c26df557e220996faa959419549
44
ENV DEBIAN_FRONTEND=noninteractive
55

6-
RUN echo 'Acquire::Retries "5";' > /etc/apt/apt.conf.d/80-retries \
6+
# ports.ubuntu.com (arm64) flakes regularly; Canonical's Azure mirror is
7+
# reachable from GitHub runners and the public internet alike.
8+
RUN sed -i 's|http://ports.ubuntu.com|http://azure.ports.ubuntu.com|g' /etc/apt/sources.list \
9+
&& echo 'Acquire::Retries "5";' > /etc/apt/apt.conf.d/80-retries \
710
&& apt-get update \
811
&& apt-get install -y --no-install-recommends \
912
build-essential ca-certificates cmake curl file git nasm pkg-config \

docker/Dockerfile.runtime

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ FROM ubuntu:22.04
33
ARG TARGETARCH
44
ENV DEBIAN_FRONTEND=noninteractive
55

6-
RUN echo 'Acquire::Retries "5";' > /etc/apt/apt.conf.d/80-retries \
6+
RUN sed -i 's|http://ports.ubuntu.com|http://azure.ports.ubuntu.com|g' /etc/apt/sources.list \
7+
&& echo 'Acquire::Retries "5";' > /etc/apt/apt.conf.d/80-retries \
78
&& apt-get update \
89
&& apt-get install -y --no-install-recommends libjpeg-turbo8 zlib1g \
910
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)