Skip to content

nginx 1.25.4 + njs 0.8.3 + headers-more-nginx-module 0.37 #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 13, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 8 additions & 8 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down