diff --git a/Dockerfile b/Dockerfile index 453e310..1b37a69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG LIBXSLT_VER=1.1.37 ARG XMLSTAR_VER=1.6.1 ARG OPENSSL_VER=3.0.8 ARG NGHTTP2_VER=1.52.0 -ARG CURL_VER=curl-8_0_1 +ARG CURL_VER=8.0.1 ARG OUTPUT=/output ARG DESTDIR=/prefix @@ -245,13 +245,19 @@ RUN git clone https://github.com/nghttp2/nghttp2.git -b v$NGHTTP2_VER --depth 1 && cp -aP "$DESTDIR"/usr/lib/libnghttp2*.so* "$OUTPUT/usr/lib" # /usr/lib # curl --version -# curl 7.74.0-DEV (x86_64-pc-linux-musl) libcurl/7.73.0-DEV OpenSSL/1.1.1i zlib/1.2.11 nghttp2/1.41.0 +# curl 8.0.1 (x86_64-pc-linux-musl) libcurl/8.0.1 OpenSSL/3.0.8 zlib/1.2.13 nghttp2/1.52.0 +# Release-Date: 2023-03-20 # Protocols: http https -# Features: AsynchDNS HTTP2 HTTPS-proxy IPv6 Largefile libz SSL UnixSockets +# Features: alt-svc AsynchDNS HSTS HTTP2 HTTPS-proxy IPv6 Largefile libz SSL threadsafe UnixSockets ARG CURL_VER WORKDIR /tmp/curl -RUN git clone https://github.com/curl/curl.git --branch $CURL_VER --depth 1 . \ +RUN export CURL_TAG=curl-${CURL_VER//./_} \ + && git clone https://github.com/curl/curl.git --branch $CURL_TAG --depth 1 . \ + && sed -i \ + -e "/\WLIBCURL_VERSION\W/c #define LIBCURL_VERSION \"$CURL_VER\"" \ + -e "/\WLIBCURL_TIMESTAMP\W/c #define LIBCURL_TIMESTAMP \"$(git log -1 --format=%cs "$CURL_TAG")\"" \ + include/curl/curlver.h \ && autoreconf -sif \ && ./configure \ --prefix=/usr \