From eb7444b4985c983759b5e357c40c1e6caaa24dde Mon Sep 17 00:00:00 2001
From: zengxs <xiangsong.zeng@outlook.com>
Date: Tue, 26 Nov 2024 11:07:16 +0800
Subject: [PATCH] test

---
 .gitmodules                       | 2 +-
 Dockerfile                        | 9 +++++----
 {modules => njs-modules}/njs-acme | 0
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename {modules => njs-modules}/njs-acme (100%)

diff --git a/.gitmodules b/.gitmodules
index 5717724..b9146f0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,7 +26,7 @@
 	path = modules/ngx-fancyindex
 	url = https://github.com/aperezdc/ngx-fancyindex.git
 [submodule "modules/njs-acme"]
-	path = modules/njs-acme
+	path = njs-modules/njs-acme
 	url = https://github.com/nginx/njs-acme.git
 [submodule "modules/iconv-nginx-module"]
 	path = modules/iconv-nginx-module
diff --git a/Dockerfile b/Dockerfile
index 9408ebc..edcba7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG NGINX_VERSION=1.25.2
+ARG NGINX_VERSION
 
 # ==================================================================================================== #
 FROM nginx:${NGINX_VERSION} AS builder
@@ -111,12 +111,13 @@ RUN set -ex \
         https://github.com/P3TERX/GeoLite.mmdb/releases/latest/download/GeoLite2-Country.mmdb
 
 # ==================================================================================================== #
-FROM node AS njs-acme-builder
+FROM node AS njs-builder
 
 WORKDIR /app
-COPY ./modules/njs-acme .
+COPY ./njs-modules .
 
 RUN set -ex \
+    && cd njs-acme \
     && npm install \
     && npm run build
 
@@ -132,7 +133,7 @@ COPY --from=builder /opt/sregex/lib /opt/sregex/lib
 COPY --from=builder /usr/bin/njs /usr/bin/njs
 COPY --from=builder usr/src/modules/naxsi/naxsi_rules /etc/nginx/naxsi
 COPY --from=builder /usr/share/GeoIP /usr/share/GeoIP
-COPY --from=njs-acme-builder /app/dist/acme.js /usr/lib/nginx/njs_modules/acme.js
+COPY --from=njs-builder /app/njs-acme/dist/acme.js /usr/lib/nginx/njs_modules/acme.js
 
 # install runtime dependencies
 RUN set -ex \
diff --git a/modules/njs-acme b/njs-modules/njs-acme
similarity index 100%
rename from modules/njs-acme
rename to njs-modules/njs-acme