Bump curl to 8.6.0, quictls to 3.1.5, and alpine to 3.19

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
     - 
       name: Verify Curl
       run: |
-        docker run -t justdanz/curl-http3 curl --version | grep "curl 8.5.0"
+        docker run -t justdanz/curl-http3 curl --version | grep "curl 8.6.0"
 
     - 
       name: Verify Brotli support

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18 AS base
+FROM alpine:3.19 AS base
 
 RUN apk add --no-cache \
   autoconf \
@@ -12,10 +12,11 @@ RUN apk add --no-cache \
   pkgconfig \
   wget \
   zlib-dev \
-  linux-headers
+  linux-headers \
+  libpsl-dev
 
 # https://curl.se/docs/http3.html
-RUN git clone --depth 1 -b openssl-3.1.4+quic https://github.com/quictls/openssl \
+RUN git clone --depth 1 -b openssl-3.1.5+quic https://github.com/quictls/openssl \
     && cd openssl \
     && ./config enable-tls1_3 --prefix=/usr/local/openssl \
     && make \
@@ -41,15 +42,15 @@ RUN cd .. \
     && make install
 
 RUN cd .. \
-    && git clone --depth 1 -b curl-8_5_0 https://github.com/curl/curl \
+    && git clone --depth 1 -b curl-8_6_0 https://github.com/curl/curl \
     && cd curl \
     && autoreconf -fi \
     && export PKG_CONFIG_PATH=/usr/local/openssl/lib/pkgconfig:/usr/local/nghttp3/lib/pkgconfig:/usr/local/ngtcp2/lib/pkgconfig \
     && LDFLAGS="-Wl,-rpath,/usr/local/openssl/lib" ./configure -with-zlib --with-brotli --with-openssl=/usr/local/openssl --with-nghttp3=/usr/local/nghttp3 --with-ngtcp2=/usr/local/ngtcp2 \
     && make \
     && make install
 
-FROM alpine:3.18
+FROM alpine:3.19
 
 COPY --from=base /usr/local/bin/curl /usr/local/bin/curl
 COPY --from=base /usr/local/lib/libcurl.so.4 /usr/local/lib/libcurl.so.4
@@ -61,6 +62,9 @@ COPY --from=base /usr/local/openssl/lib/libssl.so.81.3 /usr/local/openssl/lib/li
 COPY --from=base /usr/local/openssl/lib/libcrypto.so.81.3 /usr/local/openssl/lib/libcrypto.so.81.3
 COPY --from=base /usr/lib/libbrotlidec.so.1 /usr/lib/libbrotlidec.so.1
 COPY --from=base /usr/lib/libbrotlicommon.so.1 /usr/lib/libbrotlicommon.so.1
+COPY --from=base /usr/lib/libpsl.so.5 /usr/lib/libpsl.so.5
+COPY --from=base /usr/lib/libidn2.so.0 /usr/lib/libidn2.so.0
+COPY --from=base /usr/lib/libunistring.so.5 /usr/lib/libunistring.so.5
 
 USER nobody
 RUN env | sort; which curl; curl --version

Makefile

@@ -1,5 +1,5 @@
 test:
-	docker run -t justdanz/curl-http3 curl --version | grep "curl 8.5.0"
+	docker run -t justdanz/curl-http3 curl --version | grep "curl 8.6.0"
 	docker run --rm justdanz/curl-http3 curl -sIL https://httpbin.org/brotli | grep -i 'content-encoding: br'
 	docker run --rm justdanz/curl-http3 curl -sIL https://blog.cloudflare.com --http3 -H 'user-agent: mozilla' | grep 'HTTP/3'