From fdb4da58118ed90a2148d8c5b3bf7129af485cff Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Wed, 13 Mar 2024 21:59:44 +0000 Subject: [PATCH 1/3] nginx 1.25.4 + njs 0.8.3 --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7e7d112..cacf02f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,21 @@ # https://hg.nginx.org/nginx/file/tip/src/core/nginx.h -ARG NGINX_VERSION=1.25.3 +ARG NGINX_VERSION=1.25.4 # https://hg.nginx.org/nginx -ARG NGINX_COMMIT=25a2efd97a3e +ARG NGINX_COMMIT=89bff782528a # https://github.com/google/ngx_brotli -ARG NGX_BROTLI_COMMIT=63ca02abdcf79c9e788d2eedcc388d2335902e52 +ARG NGX_BROTLI_COMMIT=a71f9312c2deb28875acc7bacfdd5695a111aa53 # https://github.com/google/boringssl #ARG BORINGSSL_COMMIT=fae0964b3d44e94ca2a2d21f86e61dabe683d130 -# http://hg.nginx.org/njs / v0.8.1 -ARG NJS_COMMIT=a387eed79b90 +# http://hg.nginx.org/njs / v0.8.3 +ARG NJS_COMMIT=3aba7ee62080 # 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=0.34 +ARG HEADERS_MORE_VERSION=0.37 # https://github.com/leev/ngx_http_geoip2_module/releases ARG GEOIP2_VERSION=3.4 From 0a02a260aa42c7b7566c55074e9eb533fdaea2cc Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Wed, 13 Mar 2024 22:00:45 +0000 Subject: [PATCH 2/3] CI - Using njs v0.8.3 --- .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 d6b4944..d14663b 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.8.1" + echo "console.log('Using njs v' + njs.version)" | docker run -i --rm macbre/nginx njs -q - | grep "Using njs v0.8.3" - name: Show logs if: always() From 90653f560696d1747ea62a26994054c9e474e46b Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Wed, 13 Mar 2024 22:12:31 +0000 Subject: [PATCH 3/3] Update readme.md --- readme.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/readme.md b/readme.md index 0ad9a43..1c80613 100644 --- a/readme.md +++ b/readme.md @@ -26,20 +26,20 @@ docker pull ghcr.io/macbre/nginx-http3:latest ``` $ docker run -it macbre/nginx-http3 nginx -V -nginx version: nginx/1.25.3 (quic-25a2efd97a3e) -built by gcc 13.2.1 20231014 (Alpine 13.2.1_git20231014) +nginx version: nginx/1.25.4 (quic-89bff782528a) +built by gcc 13.2.1 20231014 (Alpine 13.2.1_git20231014) built with OpenSSL 3.1.4 24 Oct 2023 TLS SNI support enabled configure arguments: - --build=quic-25a2efd97a3e + --build=quic-89bff782528a --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --modules-path=/usr/lib/nginx/modules --conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error.log --http-log-path=/var/log/nginx/access.log - --pid-path=/var/run/nginx.pid - --lock-path=/var/run/nginx.lock + --pid-path=/var/run/nginx/nginx.pid + --lock-path=/var/run/nginx/nginx.lock --http-client-body-temp-path=/var/cache/nginx/client_temp --http-proxy-temp-path=/var/cache/nginx/proxy_temp --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp @@ -78,12 +78,12 @@ 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.34 + --add-module=/usr/src/headers-more-nginx-module-0.37 --add-module=/usr/src/njs/nginx - --add-dynamic-module=/usr/src/ngx_http_geoip2_module + --add-dynamic-module=/usr/src/ngx_http_geoip2_module $ docker run -it macbre/nginx-http3 njs -v -0.8.1 +0.8.3 ``` ## SSL Grade A+ handling