From faacf7d77168cd78b57fd1e93ecc2bfc6d595fd5 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 15 Aug 2024 20:37:07 +0100
Subject: [PATCH 1/3] njs: use GitHub repository to get the source code

Resolves #149
---
 Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 33828e6e..cd66cd8c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,8 +10,8 @@ ARG NGX_BROTLI_COMMIT=a71f9312c2deb28875acc7bacfdd5695a111aa53
 # https://github.com/google/boringssl
 #ARG BORINGSSL_COMMIT=fae0964b3d44e94ca2a2d21f86e61dabe683d130
 
-# http://hg.nginx.org/njs / v0.8.5
-ARG NJS_COMMIT=a419f9189f55
+# https://github.com/nginx/njs/releases/tag/0.8.5
+ARG NJS_COMMIT=9d4bf6c60aa60a828609f64d1b5c50f71bb7ef62
 
 # https://github.com/openresty/headers-more-nginx-module#installation
 # we want to have https://github.com/openresty/headers-more-nginx-module/commit/e536bc595d8b490dbc9cf5999ec48fca3f488632
@@ -165,9 +165,11 @@ RUN \
 
 RUN \
   echo "Cloning and configuring njs ..." \
-  && cd /usr/src \
-  && hg clone --rev ${NJS_COMMIT} http://hg.nginx.org/njs \
+  && mkdir /usr/src/njs \
   && cd /usr/src/njs \
+  && git init \
+  && git remote add origin https://github.com/nginx/njs.git \
+  && git fetch --depth 1 origin ${NJS_COMMIT} \
   && ./configure \
   && make njs \
   && mv /usr/src/njs/build/njs /usr/sbin/njs \

From 371925e3fae16dfac69e130f835cb58e4b3dfe24 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 15 Aug 2024 20:40:33 +0100
Subject: [PATCH 2/3] Make njs configure script executable

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cd66cd8c..54c20766 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -169,7 +169,8 @@ RUN \
   && cd /usr/src/njs \
   && git init \
   && git remote add origin https://github.com/nginx/njs.git \
-  && git fetch --depth 1 origin ${NJS_COMMIT} \
+  && git fetch --depth 1 origin ${NJS_COMMIT} && ls -lh \
+  && chmod 744 configure \
   && ./configure \
   && make njs \
   && mv /usr/src/njs/build/njs /usr/sbin/njs \

From 9fa1f09b1443bfaee2bad42c3e4e0c507f368fe8 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 15 Aug 2024 20:43:39 +0100
Subject: [PATCH 3/3] njs: git checkout -q FETCH_HEAD

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 54c20766..8091a044 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -169,8 +169,8 @@ RUN \
   && cd /usr/src/njs \
   && git init \
   && git remote add origin https://github.com/nginx/njs.git \
-  && git fetch --depth 1 origin ${NJS_COMMIT} && ls -lh \
-  && chmod 744 configure \
+  && git fetch --depth 1 origin ${NJS_COMMIT} \
+  && git checkout -q FETCH_HEAD \
   && ./configure \
   && make njs \
   && mv /usr/src/njs/build/njs /usr/sbin/njs \