Skip to content

Commit

Permalink
builder-support: Use curl's "fail fast with no output at all on serve…
Browse files Browse the repository at this point in the history
…r errors" option
  • Loading branch information
rgacogne committed Oct 11, 2023
1 parent 115db75 commit 97d18cb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion builder-support/dockerfiles/Dockerfile.debbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion builder-support/dockerfiles/Dockerfile.rpmbuild
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,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

Expand Down
2 changes: 1 addition & 1 deletion builder-support/helpers/install_rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fi
cd /tmp
echo $0: Downloading $RUST_TARBALL

curl -o $RUST_TARBALL $SITE/$RUST_TARBALL
curl -f -o $RUST_TARBALL $SITE/$RUST_TARBALL
# Line below should echo two spaces between digest and name
echo $VALUE" "$RUST_TARBALL | sha256sum -c -
tar -zxf $RUST_TARBALL
Expand Down

0 comments on commit 97d18cb

Please sign in to comment.