From babc597032d6c5786d923ae480b0391ff321721a Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Tue, 12 Apr 2022 20:26:02 +0100 Subject: [PATCH 01/14] nginx 1.21.7 https://hg.nginx.org/nginx-quic/rev/ce6d9cf0f567 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1827386..098d049 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ # https://hg.nginx.org/nginx-quic/file/tip/src/core/nginx.h -ARG NGINX_VERSION=1.21.6 +ARG NGINX_VERSION=1.21.7 # https://hg.nginx.org/nginx-quic/shortlog/quic -ARG NGINX_COMMIT=7c2adf237091 +ARG NGINX_COMMIT=ce6d9cf0f567 # https://github.com/google/ngx_brotli ARG NGX_BROTLI_COMMIT=9aec15e2aa6feea2113119ba06460af70ab3ea62 From 392eb008d835834c5cc0f3074c33e18621c84b41 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Sun, 12 Jun 2022 20:55:09 +0200 Subject: [PATCH 02/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 098d049..465c189 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG NGINX_VERSION=1.21.7 # https://hg.nginx.org/nginx-quic/shortlog/quic -ARG NGINX_COMMIT=ce6d9cf0f567 +ARG NGINX_COMMIT=efbcdb9b37dc # https://github.com/google/ngx_brotli ARG NGX_BROTLI_COMMIT=9aec15e2aa6feea2113119ba06460af70ab3ea62 From 4a90f44f31fc8ce49dad76b06daed75e825261e9 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Thu, 23 Jun 2022 10:12:54 +0100 Subject: [PATCH 03/14] v1.23.0 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 465c189..ac7c20a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ # https://hg.nginx.org/nginx-quic/file/tip/src/core/nginx.h -ARG NGINX_VERSION=1.21.7 +ARG NGINX_VERSION=1.23.0 # https://hg.nginx.org/nginx-quic/shortlog/quic -ARG NGINX_COMMIT=efbcdb9b37dc +ARG NGINX_COMMIT=8d0753760546 # https://github.com/google/ngx_brotli ARG NGX_BROTLI_COMMIT=9aec15e2aa6feea2113119ba06460af70ab3ea62 From fb465b680da84cf0a191a2ef22f853d71d4d8099 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Mon, 27 Jun 2022 13:58:05 +0100 Subject: [PATCH 04/14] headers-more-nginx-module: fix for nginx 1.23.0 Use https://github.com/openresty/headers-more-nginx-module/pull/134 --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ac7c20a..35204d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,8 @@ ARG NGX_BROTLI_COMMIT=9aec15e2aa6feea2113119ba06460af70ab3ea62 ARG BORINGSSL_COMMIT=123eaaef26abc278f53ae338e9c758eb01c70b08 # 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=master # https://hg.nginx.org/nginx-quic/file/quic/README#l72 ARG CONFIG="\ @@ -148,7 +149,7 @@ RUN \ RUN \ echo "Downloading headers-more-nginx-module ..." \ && cd /usr/src \ - && wget https://github.com/openresty/headers-more-nginx-module/archive/refs/tags/v${HEADERS_MORE_VERSION}.tar.gz -O headers-more-nginx-module.tar.gz \ + && wget https://github.com/openresty/headers-more-nginx-module/archive/refs/heads/{HEADERS_MORE_VERSION}.tar.gz -O headers-more-nginx-module.tar.gz \ && tar -xf headers-more-nginx-module.tar.gz RUN \ From 3507807c95180134da0b8a42bc5830216872fc4b Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Mon, 27 Jun 2022 14:57:13 +0100 Subject: [PATCH 05/14] HEADERS_MORE_VERSION: fix a tpoy --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 35204d0..0d16809 100644 --- a/Dockerfile +++ b/Dockerfile @@ -149,7 +149,7 @@ RUN \ RUN \ echo "Downloading headers-more-nginx-module ..." \ && cd /usr/src \ - && wget https://github.com/openresty/headers-more-nginx-module/archive/refs/heads/{HEADERS_MORE_VERSION}.tar.gz -O headers-more-nginx-module.tar.gz \ + && wget https://github.com/openresty/headers-more-nginx-module/archive/refs/heads/${HEADERS_MORE_VERSION}.tar.gz -O headers-more-nginx-module.tar.gz \ && tar -xf headers-more-nginx-module.tar.gz RUN \ From 65724b101783897dfb744335e2f87e82a415e5f8 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Mon, 27 Jun 2022 15:05:42 +0100 Subject: [PATCH 06/14] Bump ngx_http_geoip2_module to v3.4 https://github.com/leev/ngx_http_geoip2_module/pull/110 comes with fixes for nginx 1.23.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0d16809..9971752 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,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 \ From 7e83a22fb86077a1a75c293883ef0151a8b067a8 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Mon, 27 Jun 2022 15:11:55 +0100 Subject: [PATCH 07/14] Update nginx -V output --- readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index f54d0e8..bd39784 100644 --- a/readme.md +++ b/readme.md @@ -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.0 (quic-8d0753760546-boringssl-123eaaef26abc278f53ae338e9c758eb01c70b08) 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-8d0753760546-boringssl-123eaaef26abc278f53ae338e9c758eb01c70b08 --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --modules-path=/usr/lib/nginx/modules @@ -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-master --add-dynamic-module=/ngx_http_geoip2_module --with-cc-opt=-I../boringssl/include --with-ld-opt='-L../boringssl/build/ssl -L../boringssl/build/crypto' From 1fa3953b598dd87355a33476f9b91d440a758462 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Tue, 26 Jul 2022 21:10:41 +0100 Subject: [PATCH 08/14] V1.23.1 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9971752..6f3a567 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -# https://hg.nginx.org/nginx-quic/file/tip/src/core/nginx.h -ARG NGINX_VERSION=1.23.0 +# 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=8d0753760546 +ARG NGINX_COMMIT=b30bec3d71d6 # https://github.com/google/ngx_brotli ARG NGX_BROTLI_COMMIT=9aec15e2aa6feea2113119ba06460af70ab3ea62 From 3567dccd79ef4bc923bf2b9e5af9fe05a36b878b Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Wed, 27 Jul 2022 12:00:02 +0100 Subject: [PATCH 09/14] Update readme.md --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index bd39784..8ec0d65 100644 --- a/readme.md +++ b/readme.md @@ -27,12 +27,12 @@ docker pull ghcr.io/macbre/nginx-http3:latest ``` $ docker run -it macbre/nginx-http3 nginx -V -nginx version: nginx/1.23.0 (quic-8d0753760546-boringssl-123eaaef26abc278f53ae338e9c758eb01c70b08) +nginx version: nginx/1.23.1 (quic-b30bec3d71d6-boringssl-123eaaef26abc278f53ae338e9c758eb01c70b08) 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-8d0753760546-boringssl-123eaaef26abc278f53ae338e9c758eb01c70b08 + --build=quic-b30bec3d71d6-boringssl-123eaaef26abc278f53ae338e9c758eb01c70b08 --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --modules-path=/usr/lib/nginx/modules From 5d8ba70a86b150bee8f424844c5bbaf08ce89cb3 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Wed, 27 Jul 2022 12:29:43 +0100 Subject: [PATCH 10/14] CI: add --max-time 5 to curl invocation And always show nginx container logs (helps debugging errors from the step above) --- .github/workflows/dockerimage.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 3ad744e..908d838 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -79,7 +79,7 @@ jobs: docker run --rm --network host ymuski/curl-http3 \ - curl -v https://localhost:8889 --http3 2>&1 | tee /tmp/h3 + curl -v 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 @@ -87,4 +87,6 @@ jobs: grep --fixed-strings '< quic-status: h3' /tmp/h3 grep --fixed-strings '

It works!

' /tmp/h3 - docker logs test_nginx + - name: Show logs + if: always() + run: docker logs test_nginx From bc2fd696a8141519385f77c2527fa44cecd81aa6 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Wed, 27 Jul 2022 12:33:34 +0100 Subject: [PATCH 11/14] Bump HEADERS_MORE_VERSION to 0.34 So that we have https://github.com/openresty/headers-more-nginx-module/commit/91eb0db9ef9ac05c4c514b8f1fdf8a8170cc354e --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f3a567..2cd66e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ARG BORINGSSL_COMMIT=123eaaef26abc278f53ae338e9c758eb01c70b08 # https://github.com/openresty/headers-more-nginx-module#installation # we want to have https://github.com/openresty/headers-more-nginx-module/commit/e536bc595d8b490dbc9cf5999ec48fca3f488632 -ARG HEADERS_MORE_VERSION=master +ARG HEADERS_MORE_VERSION=0.34 # https://hg.nginx.org/nginx-quic/file/quic/README#l72 ARG CONFIG="\ @@ -149,7 +149,7 @@ RUN \ RUN \ echo "Downloading headers-more-nginx-module ..." \ && cd /usr/src \ - && wget https://github.com/openresty/headers-more-nginx-module/archive/refs/heads/${HEADERS_MORE_VERSION}.tar.gz -O headers-more-nginx-module.tar.gz \ + && wget https://github.com/openresty/headers-more-nginx-module/archive/refs/tags/v${HEADERS_MORE_VERSION}.tar.gz -O headers-more-nginx-module.tar.gz \ && tar -xf headers-more-nginx-module.tar.gz RUN \ From 7a8d75d5004e53dea787c39208a0926f5b7ce409 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Thu, 28 Jul 2022 13:39:32 +0100 Subject: [PATCH 12/14] Bump BORINGSSL_COMMIT --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2cd66e0..2faa58d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG NGINX_COMMIT=b30bec3d71d6 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 # we want to have https://github.com/openresty/headers-more-nginx-module/commit/e536bc595d8b490dbc9cf5999ec48fca3f488632 From d9afc9c493b145ea4fd24e95a5fb5b749b56ad4d Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Thu, 4 Aug 2022 22:23:44 +0100 Subject: [PATCH 13/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2faa58d..d4bd636 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG NGINX_VERSION=1.23.1 # https://hg.nginx.org/nginx-quic/shortlog/quic -ARG NGINX_COMMIT=b30bec3d71d6 +ARG NGINX_COMMIT=3550b00d9dc8 # https://github.com/google/ngx_brotli ARG NGX_BROTLI_COMMIT=9aec15e2aa6feea2113119ba06460af70ab3ea62 From e644641006b3e01b257697a315edb3b7bd0cb2dd Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Wed, 10 Aug 2022 16:42:20 +0100 Subject: [PATCH 14/14] Update readme.md --- readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 8ec0d65..399187d 100644 --- a/readme.md +++ b/readme.md @@ -27,12 +27,12 @@ docker pull ghcr.io/macbre/nginx-http3:latest ``` $ docker run -it macbre/nginx-http3 nginx -V -nginx version: nginx/1.23.1 (quic-b30bec3d71d6-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-b30bec3d71d6-boringssl-123eaaef26abc278f53ae338e9c758eb01c70b08 + --build=quic-3550b00d9dc8-boringssl-8ce0e1c14e48109773f1e94e5f8b020aa1e24dc5 --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --modules-path=/usr/lib/nginx/modules @@ -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-master + --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'