From ad3958e5d408bc342c8dca0b9fbedf9d3115b62c Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Wed, 11 Oct 2023 12:04:21 +0200 Subject: [PATCH] builder-support: Use curl's "fail fast with no output at all on server errors" option (cherry picked from commit 97d18cb451fcac78816604556629278c9ca49d3c) --- builder-support/dockerfiles/Dockerfile.debbuild | 2 +- builder-support/dockerfiles/Dockerfile.rpmbuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builder-support/dockerfiles/Dockerfile.debbuild b/builder-support/dockerfiles/Dockerfile.debbuild index 29f10e8e27..71d30f6ee8 100644 --- a/builder-support/dockerfiles/Dockerfile.debbuild +++ b/builder-support/dockerfiles/Dockerfile.debbuild @@ -18,7 +18,7 @@ RUN mv pdns-recursor*.deb /dist; mv pdns-recursor*.ddeb /dist || true @IF [ -n "$M_dnsdist$M_all" ] RUN mkdir /libh2o && cd /libh2o && \ apt-get update && apt-get install -y cmake curl libssl-dev zlib1g-dev && \ - curl -L https://github.com/PowerDNS/h2o/archive/refs/tags/v2.2.6+pdns2.tar.gz | tar xz && \ + curl -f -L https://github.com/PowerDNS/h2o/archive/refs/tags/v2.2.6+pdns2.tar.gz | tar xz && \ CFLAGS='-fPIC' cmake -DWITH_PICOTLS=off -DWITH_BUNDLED_SSL=off -DWITH_MRUBY=off -DCMAKE_INSTALL_PREFIX=/opt ./h2o-2.2.6-pdns2 && \ make install diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild index b51ea683f0..4c8dbc5e19 100644 --- a/builder-support/dockerfiles/Dockerfile.rpmbuild +++ b/builder-support/dockerfiles/Dockerfile.rpmbuild @@ -47,7 +47,7 @@ RUN touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then # this is fine because --allowerasing is only there to deal with libcurl conflicting with libcurl-minimal on some el9 images RUN touch /var/lib/rpm/* && mkdir /libh2o && cd /libh2o && \ yum install -y --allowerasing curl libcurl openssl-devel cmake || yum install -y curl libcurl openssl-devel cmake && \ - curl -L https://github.com/PowerDNS/h2o/archive/refs/tags/v2.2.6+pdns2.tar.gz | tar xz && \ + curl -f -L https://github.com/PowerDNS/h2o/archive/refs/tags/v2.2.6+pdns2.tar.gz | tar xz && \ CFLAGS='-fPIC' cmake -DWITH_PICOTLS=off -DWITH_BUNDLED_SSL=off -DWITH_MRUBY=off -DCMAKE_INSTALL_PREFIX=/opt ./h2o-2.2.6-pdns2 && \ make install -- 2.47.2