From 863853a694a40877363f75d9d5bf1950e00a0579 Mon Sep 17 00:00:00 2001 From: Matthew Andres Moreno Date: Fri, 8 Dec 2023 17:31:12 -0500 Subject: [PATCH 1/2] Buff apt against intermittent fail --- Dockerfile | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8190ae8cb1..017e1e3d68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,23 +24,15 @@ RUN \ # remove -backports, -updates, -proposed, -security repositories # looks like we have to grab libxxhash0 from -updates now RUN \ - apt-get update -y \ + for n in $(seq 1 5); do apt-get update -y && sleep 5 && break; done \ && \ - apt-get install --no-install-recommends libxxhash0 \ + apt-get install --no-install-recommends libxxhash0 software-properties-common \ && \ - apt-get clean \ - && \ - rm -rf /var/lib/apt/lists/* \ - && \ - apt-get update -y \ - && \ - apt-get install -y software-properties-common \ - && \ - add-apt-repository -y ppa:ubuntu-toolchain-r/test \ + for n in $(seq 1 5); do add-apt-repository -y ppa:ubuntu-toolchain-r/test && sleep 5 && break; done \ && \ - add-apt-repository -y ppa:deadsnakes/ppa \ + for n in $(seq 1 5); do add-apt-repository -y ppa:deadsnakes/ppa && sleep 5 && break; done \ && \ - apt-get update -y \ + for n in $(seq 1 5); do apt-get update -y && sleep 5 && break; done \ && \ apt-get install --no-install-recommends --allow-downgrades -y \ build-essential \ From 9641ef5c83a6220f7963de166e8fdf3a67cdddc0 Mon Sep 17 00:00:00 2001 From: Matthew Andres Moreno Date: Fri, 8 Dec 2023 17:32:56 -0500 Subject: [PATCH 2/2] Fix missing -y in apt get install --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 017e1e3d68..238d21c095 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN \ RUN \ for n in $(seq 1 5); do apt-get update -y && sleep 5 && break; done \ && \ - apt-get install --no-install-recommends libxxhash0 software-properties-common \ + apt-get install --no-install-recommends -y libxxhash0 software-properties-common \ && \ for n in $(seq 1 5); do add-apt-repository -y ppa:ubuntu-toolchain-r/test && sleep 5 && break; done \ && \