Bump version v1.23.2 (#43)

levonet · Dec 21, 2023 · 518dbad · 518dbad
1 parent 63894cc
commit 518dbad
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 37 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,16 +1,18 @@
 FROM alpine:3.16 AS build
 
-ENV NGINX_VERSION 1.23.1
+ENV NGINX_VERSION 1.23.2
 # https://github.com/nginx/njs
-ENV NJS_MODULE_VERSION 0.7.6
+ENV NJS_MODULE_VERSION 0.7.8
+# https://github.com/google/ngx_brotli
+ENV BROTLI_MODULE_VERSION 6e975bcb015f62e1f303054897783355e2a877dc
 # https://github.com/openresty/echo-nginx-module
-ENV ECHO_MODULE_VERSION v0.62
+ENV ECHO_MODULE_VERSION v0.63
 # https://github.com/openresty/headers-more-nginx-module
 ENV HEADERS_MODULE_VERSION v0.34
 # https://github.com/openresty/memc-nginx-module
 ENV MEMC_MODULE_VERSION v0.19
 # https://github.com/vision5/ngx_devel_kit
-ENV NDK_MODULE_VERSION v0.3.1
+ENV NDK_MODULE_VERSION v0.3.2
 # https://github.com/openresty/ngx_postgres
 ENV POSTGRES_MODULE_VERSION master
 # https://github.com/openresty/rds-json-nginx-module
@@ -34,7 +36,7 @@ ENV JAEGER_CLIENT_VERSION v0.9.0
 # https://github.com/opentracing/opentracing-cpp
 ENV OPENTRACING_LIB_VERSION v1.6.0
 # https://github.com/opentracing-contrib/nginx-opentracing
-ENV OPENTRACING_MODULE_VERSION v0.26.0
+ENV OPENTRACING_MODULE_VERSION v0.27.0
 
 COPY *.patch /tmp/
 RUN set -eux \
@@ -149,15 +151,12 @@ RUN set -eux \
     && git clone --depth=1 --single-branch -b ${STICKY_MODULE_VERSION} https://github.com/levonet/nginx-sticky-module-ng.git \
     \
     # Upstream health check
-    && git clone --depth=1 https://github.com/2Fast2BCn/nginx_upstream_check_module.git \
-    && (cd nginx_upstream_check_module; \
-        patch -p1 < /tmp/nginx_upstream_check_module-only-worker-proccess.patch; \
-    ) \
-    && patch -p1 < /usr/src/nginx-${NGINX_VERSION}/nginx_upstream_check_module/check_1.18.0.patch \
+    && git clone --depth=1 https://github.com/levonet/nginx_upstream_check_module.git \
+    && patch -p1 < /usr/src/nginx-${NGINX_VERSION}/nginx_upstream_check_module/check_1.20.1+.patch \
     \
     # Brotli
-    && git clone --depth=1 https://github.com/google/ngx_brotli.git \
-    && (cd ngx_brotli; git submodule update --init) \
+    && git clone https://github.com/google/ngx_brotli.git \
+    && (cd ngx_brotli; git checkout ${BROTLI_MODULE_VERSION}; git submodule update --init) \
     \
     # Redis
     && git clone --depth=1 --single-branch -b ${REDIS_MODULE_VERSION} https://github.com/zhuizhuhaomeng/ngx_http_redis.git \

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links
 
 - [`latest` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/master/Dockerfile)
-- [`1.23.1-alpine`, `1.23-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.23.1/Dockerfile) Mainline version
+- [`1.23.2-alpine`, `1.23-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.23.2/Dockerfile) Mainline version
 - [`1.22.0-alpine`, `1.22-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.22.0/Dockerfile) Stable version
 - <details><summary>Older versions</summary>
 
@@ -29,7 +29,7 @@ The difference from the [official Nginx docker image](https://hub.docker.com/_/n
 - with [Sticky](https://github.com/levonet/nginx-sticky-module-ng) dynamic module
 - with [Sync upstreams](https://github.com/weibocom/nginx-upsync-module#readme) dynamic module
 - with [Stream sync upstreams](https://github.com/xiaokai-wang/nginx-stream-upsync-module#readme) dynamic module
-- with [Upstream health check](https://github.com/2Fast2BCn/nginx_upstream_check_module#readme) module
+- with [Upstream health check](https://github.com/levonet/nginx_upstream_check_module#readme) module
 - with [Brotli](https://github.com/google/ngx_brotli#readme) dynamic module
 - with [Various set_xxx directives](https://github.com/openresty/set-misc-nginx-module#readme) dynamic module
 - with [Headers more](https://github.com/openresty/headers-more-nginx-module#readme) dynamic module

diff --git a/nginx_upstream_check_module-only-worker-proccess.patch b/nginx_upstream_check_module-only-worker-proccess.patch
diff --git a/test/Makefile b/test/Makefile
@@ -1,17 +1,19 @@
 DOCKER_TAG ?= latest
 DOCKER_IMAGE ?= levonet/nginx:$(DOCKER_TAG)
 TESTS = check jaeger njs proxy_connect redis sticky
+DOCKER ?= docker
+DOCKER_COMPOSE ?= docker-compose
 
 .PHONY: all build test clean $(TESTS)
 all: build test
 test: $(TESTS)
 
 build:
-	docker build -t $(DOCKER_IMAGE) ..
+	$(DOCKER) build -t $(DOCKER_IMAGE) ..
 
 $(TESTS):
 	cd $@; \
-	docker-compose up --build --abort-on-container-exit
+	$(DOCKER_COMPOSE) up --build --abort-on-container-exit
 
 clean:
 	rm -rf */node_modules
diff --git a/test/check/Dockerfile b/test/check/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10-slim AS base
+FROM node:14-slim AS base
 
 ENV DOCKERIZE_VERSION v0.6.1
 RUN set -eux \

diff --git a/test/jaeger/Dockerfile b/test/jaeger/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10-slim AS base
+FROM node:14-slim AS base
 
 ENV DOCKERIZE_VERSION v0.6.1
 RUN set -eux \

diff --git a/test/njs/Dockerfile b/test/njs/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10-slim AS base
+FROM node:14-slim AS base
 
 ENV DOCKERIZE_VERSION v0.6.1
 RUN set -eux \

diff --git a/test/proxy_connect/Dockerfile b/test/proxy_connect/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10-slim AS base
+FROM node:14-slim AS base
 
 ENV DOCKERIZE_VERSION v0.6.1
 RUN set -eux \

diff --git a/test/redis/Dockerfile b/test/redis/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10-slim AS base
+FROM node:14-slim AS base
 
 ENV DOCKERIZE_VERSION v0.6.1
 RUN set -eux \

diff --git a/test/sticky/Dockerfile b/test/sticky/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10-slim AS base
+FROM node:14-slim AS base
 
 ENV DOCKERIZE_VERSION v0.6.1
 RUN set -eux \