Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,14 @@ jobs:


docker run --rm --network host ghcr.io/macbre/curl-http3 \
curl -v --insecure https://localhost:8889 --http3 2>&1 | tee /tmp/h3
curl -v --insecure https://localhost:8889 --http3 --max-time 5 2>&1 | tee /tmp/h3

grep --fixed-strings '< HTTP/3 200' /tmp/h3
grep --fixed-strings --invert-match -i '< server: nginx' /tmp/h3 > /dev/null
grep --fixed-strings '< alt-svc: h3-27=":8889"; ma=86400, h3-28=":8889"; ma=86400, h3-29=":8889"; ma=86400' /tmp/h3
grep --fixed-strings '< quic-status: h3' /tmp/h3
grep --fixed-strings '<p>It works!</p>' /tmp/h3

docker logs test_nginx
- name: Show logs
if: always()
run: docker logs test_nginx
13 changes: 7 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
# https://hg.nginx.org/nginx-quic/file/tip/src/core/nginx.h
ARG NGINX_VERSION=1.21.6
# https://hg.nginx.org/nginx-quic/fie/tip/src/core/nginx.h
ARG NGINX_VERSION=1.23.1

# https://hg.nginx.org/nginx-quic/shortlog/quic
ARG NGINX_COMMIT=7c2adf237091
ARG NGINX_COMMIT=3550b00d9dc8

# https://github.com/google/ngx_brotli
ARG NGX_BROTLI_COMMIT=9aec15e2aa6feea2113119ba06460af70ab3ea62

# https://github.com/google/boringssl
ARG BORINGSSL_COMMIT=123eaaef26abc278f53ae338e9c758eb01c70b08
ARG BORINGSSL_COMMIT=8ce0e1c14e48109773f1e94e5f8b020aa1e24dc5

# https://github.com/openresty/headers-more-nginx-module#installation
ARG HEADERS_MORE_VERSION=0.33
# we want to have https://github.com/openresty/headers-more-nginx-module/commit/e536bc595d8b490dbc9cf5999ec48fca3f488632
ARG HEADERS_MORE_VERSION=0.34

# https://hg.nginx.org/nginx-quic/file/quic/README#l72
ARG CONFIG="\
Expand Down Expand Up @@ -76,7 +77,7 @@ ARG HEADERS_MORE_VERSION
ARG CONFIG

# https://github.com/leev/ngx_http_geoip2_module/releases
ARG GEOIP2_VERSION=3.3
ARG GEOIP2_VERSION=3.4

RUN \
apk add --no-cache --virtual .build-deps \
Expand Down
6 changes: 3 additions & 3 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ docker pull ghcr.io/macbre/nginx-http3:latest

```
$ docker run -it macbre/nginx-http3 nginx -V
nginx version: nginx/1.21.6 (quic-7c2adf237091-boringssl-123eaaef26abc278f53ae338e9c758eb01c70b08)
nginx version: nginx/1.23.1 (quic-3550b00d9dc8-boringssl-8ce0e1c14e48109773f1e94e5f8b020aa1e24dc5)
built by gcc 10.3.1 20210424 (Alpine 10.3.1_git20210424)
built with OpenSSL 1.1.1 (compatible; BoringSSL) (running with BoringSSL)
TLS SNI support enabled
configure arguments:
--build=quic-7c2adf237091-boringssl-123eaaef26abc278f53ae338e9c758eb01c70b08
--build=quic-3550b00d9dc8-boringssl-8ce0e1c14e48109773f1e94e5f8b020aa1e24dc5
--prefix=/etc/nginx
--sbin-path=/usr/sbin/nginx
--modules-path=/usr/lib/nginx/modules
Expand Down Expand Up @@ -79,7 +79,7 @@ configure arguments:
--with-http_v2_module
--with-http_v3_module
--add-module=/usr/src/ngx_brotli
--add-module=/usr/src/headers-more-nginx-module-0.33
--add-module=/usr/src/headers-more-nginx-module-0.34
--add-dynamic-module=/ngx_http_geoip2_module
--with-cc-opt=-I../boringssl/include
--with-ld-opt='-L../boringssl/build/ssl -L../boringssl/build/crypto'
Expand Down