diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5142764..8725176 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: - name: Verify Curl run: | - docker run -t justdanz/curl-http3 curl --version | grep "curl 8.7.0" + docker run -t justdanz/curl-http3 curl --version | grep "curl 8.8.0" - name: Verify Brotli support diff --git a/Dockerfile b/Dockerfile index e154309..92f9c55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 AS base +FROM alpine:3.20 AS base RUN apk add --no-cache \ autoconf \ @@ -16,7 +16,7 @@ RUN apk add --no-cache \ libpsl-dev # https://curl.se/docs/http3.html -RUN git clone --depth 1 -b openssl-3.2.1 https://github.com/openssl/openssl \ +RUN git clone --depth 1 -b openssl-3.3.1 https://github.com/openssl/openssl \ && cd openssl \ && ./config enable-tls1_3 --prefix=/usr/local/openssl \ && make \ @@ -26,15 +26,16 @@ RUN git clone --depth 1 -b openssl-3.2.1 https://github.com/openssl/openssl \ RUN cp -r /usr/local/openssl/lib64 /usr/local/openssl/lib 2>/dev/null || : RUN cd .. \ - && git clone --depth 1 -b v1.1.0 https://github.com/ngtcp2/nghttp3 \ + && git clone --depth 1 -b v1.3.0 https://github.com/ngtcp2/nghttp3 \ && cd nghttp3 \ - && autoreconf -fi \ + && git submodule update --init \ + && autoreconf -i \ && ./configure --prefix=/usr/local/nghttp3 --enable-lib-only \ && make \ && make install RUN cd .. \ - && git clone --depth 1 -b curl-8_7_1 https://github.com/curl/curl \ + && git clone --depth 1 -b curl-8_8_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 \ @@ -42,7 +43,7 @@ RUN cd .. \ && make \ && make install -FROM alpine:3.19 +FROM alpine:3.20 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 diff --git a/Makefile b/Makefile index db855b2..50ce007 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ test: - docker run -t justdanz/curl-http3 curl --version | grep "curl 8.7.0" + docker run -t justdanz/curl-http3 curl --version | grep "curl 8.8.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'