Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
zengxs committed Nov 26, 2024
1 parent f27602d commit eb7444b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NGINX_VERSION=1.25.2
ARG NGINX_VERSION

# ==================================================================================================== #
FROM nginx:${NGINX_VERSION} AS builder
Expand Down Expand Up @@ -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

Expand All @@ -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 \
Expand Down

0 comments on commit eb7444b

Please sign in to comment.