Skip to content

Commit 3475299

Browse files
authored
Bump to nginx 1.27.2 (#151)
* 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
1 parent a6efd87 commit 3475299

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.github/workflows/dockerimage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
111111
- name: Test njs command line
112112
run: |
113-
echo "console.log('Using njs v' + njs.version)" | docker run -i --rm macbre/nginx njs -q - | grep "Using njs v0.8.5"
113+
echo "console.log('Using njs v' + njs.version)" | docker run -i --rm macbre/nginx njs -q - | grep "Using njs v0.8.6"
114114
115115
- name: Show logs
116116
if: always()

Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# https://hg.nginx.org/nginx/file/tip/src/core/nginx.h
2-
ARG NGINX_VERSION=1.27.1
2+
ARG NGINX_VERSION=1.27.2
33

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

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

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

13-
# https://github.com/nginx/njs/releases/tag/0.8.5
14-
ARG NJS_COMMIT=9d4bf6c60aa60a828609f64d1b5c50f71bb7ef62
13+
# https://github.com/nginx/njs/releases/tag/0.8.6
14+
ARG NJS_COMMIT=c5a29a7af8894ee1ec44ebda71ef0ea1f2a31af6
1515

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

2727
# https://nginx.org/en/docs/http/ngx_http_v3_module.html
2828
ARG CONFIG="\
29-
--build=quic-$NGINX_COMMIT \
29+
--build=$NGINX_COMMIT \
3030
--prefix=/etc/nginx \
3131
--sbin-path=/usr/sbin/nginx \
3232
--modules-path=/usr/lib/nginx/modules \
@@ -125,7 +125,7 @@ WORKDIR /usr/src/
125125

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

130130
RUN \
131131
echo "Cloning brotli $NGX_BROTLI_COMMIT ..." \

readme.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ docker pull ghcr.io/macbre/nginx-http3:latest
2626

2727
```
2828
$ docker run -it macbre/nginx-http3 nginx -V
29-
nginx version: nginx/1.27.1 (quic-8796dfbe7177)
29+
nginx version: nginx/1.27.2 (331eae3dccf8)
3030
built by gcc 13.2.1 20240309 (Alpine 13.2.1_git20240309)
31-
built with OpenSSL 3.3.1 4 Jun 2024
31+
built with OpenSSL 3.3.2 3 Sep 2024
3232
TLS SNI support enabled
3333
configure arguments:
34-
--build=quic-8796dfbe7177
34+
--build=331eae3dccf8
3535
--prefix=/etc/nginx
3636
--sbin-path=/usr/sbin/nginx
3737
--modules-path=/usr/lib/nginx/modules
@@ -84,7 +84,7 @@ configure arguments:
8484
--add-dynamic-module=/usr/src/ngx_http_geoip2_module
8585
8686
$ docker run -it macbre/nginx-http3 njs -v
87-
0.8.5
87+
0.8.6
8888
```
8989

9090
## SSL Grade A+ handling

0 commit comments

Comments
 (0)