From 2d8e7368ae506082e348146ac6ffb0095dd2f1de Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Wed, 11 Oct 2023 11:21:43 -0700 Subject: [PATCH] CI: Add timeouts for apt commands in docker builder Dockerfiles --- docker/builder.Dockerfile | 5 +++++ docker/final.Dockerfile | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/docker/builder.Dockerfile b/docker/builder.Dockerfile index 0c1685ac2e..96c595b102 100644 --- a/docker/builder.Dockerfile +++ b/docker/builder.Dockerfile @@ -3,8 +3,13 @@ # Layer to build Zeek. FROM debian:bookworm-slim +# Allow apt to retry 3 times before failing. RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries +# Force apt to timeout retrieval of data after 3 minutes. +RUN echo 'Acquire::http::timeout "180";' > /etc/apt/apt.conf.d/99-timeouts +RUN echo 'Acquire::https::timeout "180";' >> /etc/apt/apt.conf.d/99-timeouts + # Configure system for build. RUN apt-get -q update \ && apt-get install -q -y --no-install-recommends \ diff --git a/docker/final.Dockerfile b/docker/final.Dockerfile index e13931f93b..c70999de2a 100644 --- a/docker/final.Dockerfile +++ b/docker/final.Dockerfile @@ -3,8 +3,13 @@ # Final layer containing all artifacts. FROM debian:bookworm-slim +# Allow apt to retry 3 times before failing. RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries +# Force apt to timeout retrieval of data after 3 minutes. +RUN echo 'Acquire::http::timeout "180";' > /etc/apt/apt.conf.d/99-timeouts +RUN echo 'Acquire::https::timeout "180";' >> /etc/apt/apt.conf.d/99-timeouts + RUN apt-get -q update \ && apt-get install -q -y --no-install-recommends \ ca-certificates \