Skip to content

Commit 732531c

Browse files
committed
njs to 8.6 and using the release branch instead of a commit hash
1 parent 33a2e80 commit 732531c

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.github/workflows/dockerimage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
114114
- name: Test njs command line
115115
run: |
116-
echo "console.log('Using njs v' + njs.version)" | docker run -i --rm justdanz/nginx njs -q - | grep "Using njs v0.8.4"
116+
echo "console.log('Using njs v' + njs.version)" | docker run -i --rm justdanz/nginx njs -q - | grep "Using njs v0.8.6"
117117
118118
- name: Show logs
119119
if: always()

Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG NGX_BROTLI_COMMIT=6e975bcb015f62e1f303054897783355e2a877dc
88
ARG QUICTLS_BRANCH=openssl-3.3.0+quic
99

1010
# https://github.com/nginx/njs
11-
ARG NJS_COMMIT=39a2d4bf212346d1487e4d27383453cafefa17ea
11+
ARG NJS_VERSION=0.8.6
1212

1313
# https://github.com/openresty/headers-more-nginx-module#installation
1414
# we want to have https://github.com/openresty/headers-more-nginx-module/commit/e536bc595d8b490dbc9cf5999ec48fca3f488632
@@ -77,7 +77,7 @@ ARG NGINX_VERSION
7777
ARG NGINX_COMMIT
7878
ARG NGX_BROTLI_COMMIT
7979
ARG HEADERS_MORE_VERSION
80-
ARG NJS_COMMIT
80+
ARG NJS_VERSION
8181
ARG GEOIP2_VERSION
8282
ARG CONFIG
8383

@@ -146,10 +146,8 @@ RUN \
146146

147147
RUN \
148148
echo "Cloning and configuring njs ..." \
149-
&& cd /usr/src \
150-
&& git clone --depth 1 https://github.com/nginx/njs.git \
149+
&& git clone --depth 1 --branch ${NJS_VERSION} https://github.com/nginx/njs.git /usr/src/njs \
151150
&& cd /usr/src/njs \
152-
&& git checkout ${NJS_COMMIT} \
153151
&& ./configure \
154152
&& make njs \
155153
&& mv /usr/src/njs/build/njs /usr/sbin/njs \

0 commit comments

Comments
 (0)