From defc7289bce12f8ee23b6cfecf82499514b1ddfd Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 15 Oct 2024 04:28:43 +0200 Subject: [PATCH] docker/ubuntu-full/Dockerfile: revert to using wget for https://github.com/ stuff I've observed while building 3.9.3 image systematic failures when using curl on https://github.com/ content, when run under the arm64 architecture under docker buildx (with qemu) Cf: ``` * Host github.com:443 was resolved. * IPv6: (none) * IPv4: 140.82.121.3 * Trying 140.82.121.3:443... * Connected to github.com (140.82.121.3) port 443 * ALPN: curl offers h2,http/1.1 } [5 bytes data] * TLSv1.3 (OUT), TLS handshake, Client hello (1): } [512 bytes data] * CAfile: /etc/ssl/certs/ca-certificates.crt * CApath: /etc/ssl/certs { [5 bytes data] * TLSv1.3 (IN), TLS handshake, Server hello (2): { [122 bytes data] * TLSv1.3 (IN), TLS handshake, Encrypted Extensions (8): { [19 bytes data] * TLSv1.3 (IN), TLS handshake, Certificate (11): { [3137 bytes data] * TLSv1.3 (IN), TLS handshake, CERT verify (15): { [79 bytes data] * TLSv1.3 (IN), TLS handshake, Finished (20): { [36 bytes data] * TLSv1.3 (OUT), TLS change cipher, Change cipher spec (1): } [1 bytes data] * TLSv1.3 (OUT), TLS handshake, Finished (20): } [36 bytes data] * SSL connection using TLSv1.3 / TLS_AES_128_GCM_SHA256 / X25519 / id-ecPublicKey * ALPN: server accepted h2 * Server certificate: * subject: CN=github.com * start date: Mar 7 00:00:00 2024 GMT * expire date: Mar 7 23:59:59 2025 GMT * subjectAltName: host "github.com" matched cert's "github.com" * issuer: C=GB; ST=Greater Manchester; L=Salford; O=Sectigo Limited; CN=Sectigo ECC Domain Validation Secure Server CA * SSL certificate verify ok. * Certificate level 0: Public key type EC/prime256v1 (256/128 Bits/secBits), signed using ecdsa-with-SHA256 * Certificate level 1: Public key type EC/prime256v1 (256/128 Bits/secBits), signed using ecdsa-with-SHA384 * Certificate level 2: Public key type EC/secp384r1 (384/192 Bits/secBits), signed using ecdsa-with-SHA384 } [5 bytes data] * Send failure: Broken pipe * OpenSSL SSL_write: Broken pipe, errno 32 * Closing connection curl: (55) Send failure: Broken pipe ``` --- docker/ubuntu-full/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/ubuntu-full/Dockerfile b/docker/ubuntu-full/Dockerfile index b4737c427ba6..a79a377d36ba 100644 --- a/docker/ubuntu-full/Dockerfile +++ b/docker/ubuntu-full/Dockerfile @@ -90,7 +90,7 @@ ARG WITH_CCACHE ARG KEA_VERSION=1.5.2 RUN --mount=type=cache,id=ubuntu-full-kealib,target=$HOME/.cache \ . /buildscripts/bh-set-envvars.sh \ - && curl -LO -fsS https://github.com/ubarsc/kealib/archive/kealib-${KEA_VERSION}.zip \ + && wget -q https://github.com/ubarsc/kealib/archive/kealib-${KEA_VERSION}.zip \ && unzip -q kealib-${KEA_VERSION}.zip \ && rm -f kealib-${KEA_VERSION}.zip \ && if [ -n "${RSYNC_REMOTE:-}" ]; then \ @@ -126,7 +126,7 @@ ARG MONGO_C_DRIVER_VERSION=1.24.4 RUN --mount=type=cache,id=ubuntu-full-mongo-c-driver,target=$HOME/.cache \ . /buildscripts/bh-set-envvars.sh \ && mkdir mongo-c-driver \ - && curl -L -fsS https://github.com/mongodb/mongo-c-driver/releases/download/${MONGO_C_DRIVER_VERSION}/mongo-c-driver-${MONGO_C_DRIVER_VERSION}.tar.gz \ + && wget -q https://github.com/mongodb/mongo-c-driver/releases/download/${MONGO_C_DRIVER_VERSION}/mongo-c-driver-${MONGO_C_DRIVER_VERSION}.tar.gz -O - \ | tar xz -C mongo-c-driver --strip-components=1 \ && if [ -n "${RSYNC_REMOTE:-}" ]; then \ echo "Downloading cache..."; \ @@ -162,7 +162,7 @@ ARG MONGOCXX_VERSION=3.8.1 RUN --mount=type=cache,id=ubuntu-full-mongo-cxx-driver,target=$HOME/.cache \ . /buildscripts/bh-set-envvars.sh \ && mkdir mongocxx \ - && curl -L -fsS https://github.com/mongodb/mongo-cxx-driver/archive/r${MONGOCXX_VERSION}.tar.gz \ + && wget -q https://github.com/mongodb/mongo-cxx-driver/archive/r${MONGOCXX_VERSION}.tar.gz -O - \ | tar xz -C mongocxx --strip-components=1 \ && if [ -n "${RSYNC_REMOTE:-}" ]; then \ echo "Downloading cache..."; \ @@ -217,7 +217,7 @@ RUN --mount=type=cache,id=ubuntu-full-tiledb,target=$HOME/.cache \ ccache -M 100M; \ fi \ && mkdir tiledb \ - && curl -L -fsS https://github.com/TileDB-Inc/TileDB/archive/${TILEDB_VERSION}.tar.gz \ + && wget -q https://github.com/TileDB-Inc/TileDB/archive/${TILEDB_VERSION}.tar.gz -O - \ | tar xz -C tiledb --strip-components=1 \ && cd tiledb \ && patch -p0 < /buildscripts/tiledb-FindLZ4_EP.cmake.patch \ @@ -247,7 +247,7 @@ ARG OPENDRIVE_VERSION=0.6.0-gdal RUN --mount=type=cache,id=ubuntu-full-libopendrive,target=$HOME/.cache \ . /buildscripts/bh-set-envvars.sh \ && if test "${OPENDRIVE_VERSION}" != ""; then ( \ - curl -LO -fsS https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \ + wget -q https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \ && tar xzf ${OPENDRIVE_VERSION}.tar.gz \ && rm -f ${OPENDRIVE_VERSION}.tar.gz \ && if [ -n "${RSYNC_REMOTE:-}" ]; then \ @@ -283,7 +283,7 @@ RUN --mount=type=cache,id=ubuntu-full-libopendrive,target=$HOME/.cache \ ARG WITH_FILEGDB= RUN . /buildscripts/bh-set-envvars.sh \ && if echo "$WITH_FILEGDB" | grep -Eiq "^(y(es)?|1|true)$" ; then ( \ - curl -LO -fsS https://github.com/Esri/file-geodatabase-api/raw/master/FileGDB_API_1.5.2/FileGDB_API-RHEL7-64gcc83.tar.gz \ + wget -q https://github.com/Esri/file-geodatabase-api/raw/master/FileGDB_API_1.5.2/FileGDB_API-RHEL7-64gcc83.tar.gz \ && tar -xzf FileGDB_API-RHEL7-64gcc83.tar.gz \ && chown -R root:root FileGDB_API-RHEL7-64gcc83 \ && mv FileGDB_API-RHEL7-64gcc83 /usr/local/FileGDB_API \ @@ -327,7 +327,7 @@ ARG WITH_PDFIUM=yes RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ if echo "$WITH_PDFIUM" | grep -Eiq "^(y(es)?|1|true)$" ; then ( \ - curl -LO -fsS https://github.com/rouault/pdfium_build_gdal_3_10/releases/download/pdfium_6677_v1/install-ubuntu2004-rev6677.tar.gz \ + wget -q https://github.com/rouault/pdfium_build_gdal_3_10/releases/download/pdfium_6677_v1/install-ubuntu2004-rev6677.tar.gz \ && tar -xzf install-ubuntu2004-rev6677.tar.gz \ && chown -R root:root install \ && mv install/lib/* /usr/lib/ \