Skip to content

Commit 9de545a

Browse files
committed
Bump openssl to 3.3.1, nghttp3 to 1.3.0, curl to 8.8.0, and alpine to 3.20
1 parent 9b7e2a3 commit 9de545a

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
-
3232
name: Verify Curl
3333
run: |
34-
docker run -t justdanz/curl-http3 curl --version | grep "curl 8.7.0"
34+
docker run -t justdanz/curl-http3 curl --version | grep "curl 8.8.0"
3535
3636
-
3737
name: Verify Brotli support

Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.19 AS base
1+
FROM alpine:3.20 AS base
22

33
RUN apk add --no-cache \
44
autoconf \
@@ -16,7 +16,7 @@ RUN apk add --no-cache \
1616
libpsl-dev
1717

1818
# https://curl.se/docs/http3.html
19-
RUN git clone --depth 1 -b openssl-3.2.1 https://github.com/openssl/openssl \
19+
RUN git clone --depth 1 -b openssl-3.3.1 https://github.com/openssl/openssl \
2020
&& cd openssl \
2121
&& ./config enable-tls1_3 --prefix=/usr/local/openssl \
2222
&& make \
@@ -26,23 +26,24 @@ RUN git clone --depth 1 -b openssl-3.2.1 https://github.com/openssl/openssl \
2626
RUN cp -r /usr/local/openssl/lib64 /usr/local/openssl/lib 2>/dev/null || :
2727

2828
RUN cd .. \
29-
&& git clone --depth 1 -b v1.1.0 https://github.com/ngtcp2/nghttp3 \
29+
&& git clone --depth 1 -b v1.3.0 https://github.com/ngtcp2/nghttp3 \
3030
&& cd nghttp3 \
31-
&& autoreconf -fi \
31+
&& git submodule update --init \
32+
&& autoreconf -i \
3233
&& ./configure --prefix=/usr/local/nghttp3 --enable-lib-only \
3334
&& make \
3435
&& make install
3536

3637
RUN cd .. \
37-
&& git clone --depth 1 -b curl-8_7_1 https://github.com/curl/curl \
38+
&& git clone --depth 1 -b curl-8_8_0 https://github.com/curl/curl \
3839
&& cd curl \
3940
&& autoreconf -fi \
4041
&& export PKG_CONFIG_PATH=/usr/local/openssl/lib/pkgconfig:/usr/local/nghttp3/lib/pkgconfig:/usr/local/ngtcp2/lib/pkgconfig \
4142
&& 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 \
4243
&& make \
4344
&& make install
4445

45-
FROM alpine:3.19
46+
FROM alpine:3.20
4647

4748
COPY --from=base /usr/local/bin/curl /usr/local/bin/curl
4849
COPY --from=base /usr/local/lib/libcurl.so.4 /usr/local/lib/libcurl.so.4

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
test:
2-
docker run -t justdanz/curl-http3 curl --version | grep "curl 8.7.0"
2+
docker run -t justdanz/curl-http3 curl --version | grep "curl 8.8.0"
33
docker run --rm justdanz/curl-http3 curl -sIL https://httpbin.org/brotli | grep -i 'content-encoding: br'
44
docker run --rm justdanz/curl-http3 curl -sIL https://blog.cloudflare.com --http3 -H 'user-agent: mozilla' | grep 'HTTP/3'
55

0 commit comments

Comments
 (0)