Skip to content

Commit

Permalink
Bump to nginx 1.27.2 (#151)
Browse files Browse the repository at this point in the history
* Bump to nginx 1.27.2

* Use the main code repository, nginx-quic is gone
* Update the njs to the latest version

* Expect "Using njs v0.8.6"

* Update readme.md
  • Loading branch information
macbre authored Oct 16, 2024
1 parent a6efd87 commit 3475299
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
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.5"
echo "console.log('Using njs v' + njs.version)" | docker run -i --rm macbre/nginx njs -q - | grep "Using njs v0.8.6"
- name: Show logs
if: always()
Expand Down
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# https://hg.nginx.org/nginx/file/tip/src/core/nginx.h
ARG NGINX_VERSION=1.27.1
ARG NGINX_VERSION=1.27.2

# https://hg.nginx.org/nginx-quic/
ARG NGINX_COMMIT=8796dfbe7177
# https://hg.nginx.org/nginx/
ARG NGINX_COMMIT=331eae3dccf8

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

# https://github.com/google/boringssl
#ARG BORINGSSL_COMMIT=fae0964b3d44e94ca2a2d21f86e61dabe683d130

# https://github.com/nginx/njs/releases/tag/0.8.5
ARG NJS_COMMIT=9d4bf6c60aa60a828609f64d1b5c50f71bb7ef62
# https://github.com/nginx/njs/releases/tag/0.8.6
ARG NJS_COMMIT=c5a29a7af8894ee1ec44ebda71ef0ea1f2a31af6

# https://github.com/openresty/headers-more-nginx-module#installation
# we want to have https://github.com/openresty/headers-more-nginx-module/commit/e536bc595d8b490dbc9cf5999ec48fca3f488632
Expand All @@ -26,7 +26,7 @@ ARG NGINX_GROUP_GID=101

# https://nginx.org/en/docs/http/ngx_http_v3_module.html
ARG CONFIG="\
--build=quic-$NGINX_COMMIT \
--build=$NGINX_COMMIT \
--prefix=/etc/nginx \
--sbin-path=/usr/sbin/nginx \
--modules-path=/usr/lib/nginx/modules \
Expand Down Expand Up @@ -125,7 +125,7 @@ WORKDIR /usr/src/

RUN \
echo "Cloning nginx $NGINX_VERSION (rev $NGINX_COMMIT from 'default' branch) ..." \
&& hg clone -b default --rev $NGINX_COMMIT https://hg.nginx.org/nginx-quic /usr/src/nginx-$NGINX_VERSION
&& hg clone -b default --rev $NGINX_COMMIT https://hg.nginx.org/nginx/ /usr/src/nginx-$NGINX_VERSION

RUN \
echo "Cloning brotli $NGX_BROTLI_COMMIT ..." \
Expand Down
8 changes: 4 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ docker pull ghcr.io/macbre/nginx-http3:latest

```
$ docker run -it macbre/nginx-http3 nginx -V
nginx version: nginx/1.27.1 (quic-8796dfbe7177)
nginx version: nginx/1.27.2 (331eae3dccf8)
built by gcc 13.2.1 20240309 (Alpine 13.2.1_git20240309)
built with OpenSSL 3.3.1 4 Jun 2024
built with OpenSSL 3.3.2 3 Sep 2024
TLS SNI support enabled
configure arguments:
--build=quic-8796dfbe7177
--build=331eae3dccf8
--prefix=/etc/nginx
--sbin-path=/usr/sbin/nginx
--modules-path=/usr/lib/nginx/modules
Expand Down Expand Up @@ -84,7 +84,7 @@ configure arguments:
--add-dynamic-module=/usr/src/ngx_http_geoip2_module
$ docker run -it macbre/nginx-http3 njs -v
0.8.5
0.8.6
```

## SSL Grade A+ handling
Expand Down

0 comments on commit 3475299

Please sign in to comment.