From aae05dfc1ab8742d2a464f09cbd6aa79d8524b18 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Wed, 23 Jun 2021 16:54:57 +0200 Subject: [PATCH] Dockerfile: Disable pacman download timeout --- README.md | 2 +- build-pkg/Dockerfile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d8a5ec0..f75c739 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ To update all submodules, run ```shell # If no local changes were done -git submodule update --remote | grep 'Submodule path' +$(set -o pipefail; git submodule update --remote | {grep 'Submodule path' || echo 'Everything up to date.' }) # Otherwise git submodule foreach 'git pull' diff --git a/build-pkg/Dockerfile b/build-pkg/Dockerfile index 1acf2a9..599e0b9 100644 --- a/build-pkg/Dockerfile +++ b/build-pkg/Dockerfile @@ -4,12 +4,14 @@ FROM archlinux:base-devel +# 0. DisableDownloadTimeout # 1. Add de-p1st mirror # 2. Enable parallel downloads # TODO: Wait until next baseimage update # && sed --in-place 's|^#ParallelDownloads\s*=.*$|ParallelDownloads = 4|' /etc/pacman.conf \ # 3. Update mirrors + packages -RUN printf '\n[de-p1st]\nSigLevel = Optional TrustAll\nServer = https://arch.p1st.de\n' >> /etc/pacman.conf && \ +RUN printf '\n[options]\nDisableDownloadTimeout\n' >> /etc/pacman.conf && \ + printf '\n[de-p1st]\nSigLevel = Optional TrustAll\nServer = https://arch.p1st.de\n' >> /etc/pacman.conf && \ pacman -Syu --noconfirm # 1. Set packager