Skip to content

Commit

Permalink
Bump openssl to 3.3.1, nghttp3 to 1.3.0, curl to 8.8.0, and alpine to…
Browse files Browse the repository at this point in the history
… 3.20
  • Loading branch information
justdan6 committed Jun 5, 2024
1 parent 9b7e2a3 commit 9de545a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19 AS base
FROM alpine:3.20 AS base

RUN apk add --no-cache \
autoconf \
Expand All @@ -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 \
Expand All @@ -26,23 +26,24 @@ 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 \
&& LDFLAGS="-Wl,-rpath,/usr/local/openssl/lib" ./configure -with-zlib --with-brotli --with-openssl=/usr/local/openssl --with-openssl-quic --with-nghttp3=/usr/local/nghttp3 \
&& 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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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'

Expand Down

0 comments on commit 9de545a

Please sign in to comment.