Skip to content

Commit 33a2e80

Browse files
committed
Nginx to 1.27.2, QuicTLS to 3.3.0, NJS bumped, and switched to use new github repos
1 parent 9aee185 commit 33a2e80

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
*.swp
2+
.DS_Store

Dockerfile

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
# https://hg.nginx.org/nginx/file/tip/src/core/nginx.h
2-
ARG NGINX_VERSION=1.27.1
3-
4-
# https://hg.nginx.org/nginx
5-
ARG NGINX_COMMIT=8796dfbe7177
1+
# https://github.com/nginx/nginx/blob/master/src/core/nginx.h
2+
ARG NGINX_VERSION=1.27.2
63

74
# https://github.com/google/ngx_brotli
85
ARG NGX_BROTLI_COMMIT=6e975bcb015f62e1f303054897783355e2a877dc
96

107
# https://github.com/quictls/openssl
11-
ARG QUICTLS_BRANCH=openssl-3.1.5+quic
8+
ARG QUICTLS_BRANCH=openssl-3.3.0+quic
129

13-
# http://hg.nginx.org/njs
14-
ARG NJS_COMMIT=11d956c1577c
10+
# https://github.com/nginx/njs
11+
ARG NJS_COMMIT=39a2d4bf212346d1487e4d27383453cafefa17ea
1512

1613
# https://github.com/openresty/headers-more-nginx-module#installation
1714
# we want to have https://github.com/openresty/headers-more-nginx-module/commit/e536bc595d8b490dbc9cf5999ec48fca3f488632
@@ -92,7 +89,6 @@ RUN \
9289
musl-dev \
9390
go \
9491
ninja \
95-
mercurial \
9692
openssl-dev \
9793
pcre-dev \
9894
zlib-dev \
@@ -118,7 +114,7 @@ WORKDIR /usr/src/
118114

119115
RUN \
120116
echo "Cloning nginx $NGINX_VERSION (rev $NGINX_COMMIT from 'default' branch) ..." \
121-
&& hg clone -b default --rev $NGINX_COMMIT https://hg.nginx.org/nginx /usr/src/nginx-$NGINX_VERSION
117+
&& git clone --depth 1 --branch release-$NGINX_VERSION https://github.com/nginx/nginx.git /usr/src/nginx-$NGINX_VERSION
122118

123119
RUN \
124120
echo "Cloning brotli $NGX_BROTLI_COMMIT ..." \
@@ -151,8 +147,9 @@ RUN \
151147
RUN \
152148
echo "Cloning and configuring njs ..." \
153149
&& cd /usr/src \
154-
&& hg clone --rev ${NJS_COMMIT} http://hg.nginx.org/njs \
150+
&& git clone --depth 1 https://github.com/nginx/njs.git \
155151
&& cd /usr/src/njs \
152+
&& git checkout ${NJS_COMMIT} \
156153
&& ./configure \
157154
&& make njs \
158155
&& mv /usr/src/njs/build/njs /usr/sbin/njs \

0 commit comments

Comments
 (0)