Skip to content

Commit

Permalink
Bump nginx to 1.25.4 and njs to 0.8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
justdan6 committed Feb 15, 2024
1 parent f3658e0 commit 0231360
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
- name: Test njs command line
run: |
echo "console.log('Using njs v' + njs.version)" | docker run -i --rm justdanz/nginx njs -q | grep "Using njs v0.7.12"
echo "console.log('Using njs v' + njs.version)" | docker run -i --rm justdanz/nginx njs -q | grep "Using njs v0.8.3"
- name: Show logs
if: always()
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# https://hg.nginx.org/nginx/file/tip/src/core/nginx.h
ARG NGINX_VERSION=1.25.3
ARG NGINX_VERSION=1.25.4

# https://hg.nginx.org/nginx
ARG NGINX_COMMIT=1d839f05409d
ARG NGINX_COMMIT=89bff782528a

# https://github.com/google/ngx_brotli
ARG NGX_BROTLI_COMMIT=6e975bcb015f62e1f303054897783355e2a877dc
Expand All @@ -11,7 +11,7 @@ ARG NGX_BROTLI_COMMIT=6e975bcb015f62e1f303054897783355e2a877dc
ARG QUICTLS_BRANCH=openssl-3.1.5+quic

# http://hg.nginx.org/njs
ARG NJS_COMMIT=a1faa64d4972
ARG NJS_COMMIT=f98dd6884786

# https://github.com/openresty/headers-more-nginx-module#installation
# we want to have https://github.com/openresty/headers-more-nginx-module/commit/e536bc595d8b490dbc9cf5999ec48fca3f488632
Expand Down Expand Up @@ -74,7 +74,7 @@ ARG CONFIG="\
--add-dynamic-module=/usr/src/ngx_http_geoip2_module \
"

FROM alpine:3.18 AS base
FROM alpine:3.19 AS base

ARG NGINX_VERSION
ARG NGINX_COMMIT
Expand Down Expand Up @@ -189,7 +189,7 @@ RUN \
| xargs -r apk info --installed \
| sort -u > /tmp/runDeps.txt

FROM alpine:3.18
FROM alpine:3.19
ARG NGINX_VERSION
ARG NGINX_COMMIT

Expand Down

0 comments on commit 0231360

Please sign in to comment.