From 0d44aadc8a3ba1b6ddfeddcbcf2df50906f0fcb3 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Fri, 15 Sep 2023 12:15:03 +0100 Subject: [PATCH 1/3] nginx 1.25.2 And a few more updated dependencies --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index c84f55e..a44fad7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,17 @@ # https://hg.nginx.org/nginx/file/tip/src/core/nginx.h -ARG NGINX_VERSION=1.25.1 +ARG NGINX_VERSION=1.25.2 # https://hg.nginx.org/nginx -ARG NGINX_COMMIT=5b8854a2f79c +ARG NGINX_COMMIT=44536076405c # https://github.com/google/ngx_brotli -ARG NGX_BROTLI_COMMIT=6e975bcb015f62e1f303054897783355e2a877dc +ARG NGX_BROTLI_COMMIT=63ca02abdcf79c9e788d2eedcc388d2335902e52 # https://github.com/google/boringssl ARG BORINGSSL_COMMIT=e1b8685770d0e82e5a4a3c5d24ad1602e05f2e83 -# http://hg.nginx.org/njs -ARG NJS_COMMIT=a1faa64d4972 +# http://hg.nginx.org/njs / v0.8.1 +ARG NJS_COMMIT=a387eed79b90 # https://github.com/openresty/headers-more-nginx-module#installation # we want to have https://github.com/openresty/headers-more-nginx-module/commit/e536bc595d8b490dbc9cf5999ec48fca3f488632 From fdf411d0de7d814e9b7e72d2ccdbd669f1cb45c2 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Fri, 15 Sep 2023 14:04:23 +0100 Subject: [PATCH 2/3] Update the njs assertion --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 9c61209..96778f9 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -110,7 +110,7 @@ jobs: - name: Test njs command line run: | - echo "console.log('Using njs v' + njs.version)" | docker run -i --rm macbre/nginx njs -q | grep "Using njs v0.7.12" + echo "console.log('Using njs v' + njs.version)" | docker run -i --rm macbre/nginx njs -q - | grep "Using njs v0.8.1" - name: Show logs if: always() From 1877230d9966ad69b68e583a8fbc82e990ca9755 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Sun, 17 Sep 2023 12:38:41 +0100 Subject: [PATCH 3/3] Update readme.md --- readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 1ff0ed7..d37ff43 100644 --- a/readme.md +++ b/readme.md @@ -26,12 +26,12 @@ docker pull ghcr.io/macbre/nginx-http3:latest ``` $ docker run -it macbre/nginx-http3 nginx -V -nginx version: nginx/1.25.1 (quic-5b8854a2f79c-boringssl-e1b8685770d0e82e5a4a3c5d24ad1602e05f2e83) +nginx version: nginx/1.25.2 (quic-44536076405c-boringssl-e1b8685770d0e82e5a4a3c5d24ad1602e05f2e83) built by gcc 12.2.1 20220924 (Alpine 12.2.1_git20220924-r4) built with OpenSSL 1.1.1 (compatible; BoringSSL) (running with BoringSSL) TLS SNI support enabled configure arguments: - --build=quic-5b8854a2f79c-boringssl-e1b8685770d0e82e5a4a3c5d24ad1602e05f2e83 + --build=quic-44536076405c-boringssl-e1b8685770d0e82e5a4a3c5d24ad1602e05f2e83 --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --modules-path=/usr/lib/nginx/modules @@ -85,7 +85,7 @@ configure arguments: --with-ld-opt='-L../boringssl/build/ssl -L../boringssl/build/crypto' $ docker run -it macbre/nginx-http3 njs -v -0.7.12 +0.8.1 ``` ## SSL Grade A+ handling