Skip to content

Commit c53a951

Browse files
[feature] bump nginx to 1.25.5 and add http3 module (#11541)
* bump nginx to 1.25.5, add http3 module, and update lua-stream, lua_ngx, mimaloc, opentelemetry_cpp, opentelemetry_proto and opentelemtry_contrib Signed-off-by: Stepan Paksashvili <[email protected]> * revert opentelemetry and owasp updates Signed-off-by: Stepan Paksashvili <[email protected]> --------- Signed-off-by: Stepan Paksashvili <[email protected]> Co-authored-by: Stepan Paksashvili <[email protected]>
1 parent 742c620 commit c53a951

File tree

3 files changed

+20
-19
lines changed

3 files changed

+20
-19
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ clean-chroot-image: ## Removes local image
110110

111111
.PHONY: build
112112
build: ## Build ingress controller, debug tool and pre-stop hook.
113-
E2E_IMAGE=golang:$(GO_VERSION)-alpine3.19 USE_SHELL=/bin/sh build/run-in-docker.sh \
113+
E2E_IMAGE=golang:$(GO_VERSION)-alpine3.20 USE_SHELL=/bin/sh build/run-in-docker.sh \
114114
MAC_OS=$(MAC_OS) \
115115
PKG=$(PKG) \
116116
ARCH=$(ARCH) \

images/nginx-1.25/TAG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.0.6
1+
v0.0.7

images/nginx-1.25/rootfs/build.sh

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
export NGINX_VERSION=1.25.3
21+
export NGINX_VERSION=1.25.5
2222

2323
# Check for recent changes: https://github.com/vision5/ngx_devel_kit/compare/v0.3.3...master
2424
export NDK_VERSION=v0.3.3
@@ -41,43 +41,43 @@ export MODSECURITY_VERSION=v1.0.3
4141
# Check for recent changes: https://github.com/SpiderLabs/ModSecurity/compare/v3.0.8...v3/master
4242
export MODSECURITY_LIB_VERSION=v3.0.12
4343

44-
# Check for recent changes: https://github.com/coreruleset/coreruleset/compare/v3.3.2...v3.3/master
44+
# Check for recent changes: https://github.com/coreruleset/coreruleset/compare/v3.3.5...main
4545
export OWASP_MODSECURITY_CRS_VERSION=v3.3.5
4646

47-
# Check for recent changes: https://github.com/openresty/lua-nginx-module/compare/v0.10.25...master
48-
export LUA_NGX_VERSION=v0.10.26
47+
# Check for recent changes: https://github.com/openresty/lua-nginx-module/compare/b5d1688ae722538ba4dc8a7ec08820a08abfb93d...master
48+
export LUA_NGX_VERSION=b5d1688ae722538ba4dc8a7ec08820a08abfb93d
4949

50-
# Check for recent changes: https://github.com/openresty/stream-lua-nginx-module/compare/v0.0.13...master
51-
export LUA_STREAM_NGX_VERSION=v0.0.14
50+
# Check for recent changes: https://github.com/openresty/stream-lua-nginx-module/compare/bea8a0c0de94cede71554f53818ac0267d675d63...master
51+
export LUA_STREAM_NGX_VERSION=bea8a0c0de94cede71554f53818ac0267d675d63
5252

5353
# Check for recent changes: https://github.com/openresty/lua-upstream-nginx-module/compare/8aa93ead98ba2060d4efd594ae33a35d153589bf...master
5454
export LUA_UPSTREAM_VERSION=542be0893543a4e42d89f6dd85372972f5ff2a36
5555

56-
# Check for recent changes: https://github.com/openresty/lua-cjson/compare/2.1.0.11...openresty:master
56+
# Check for recent changes: https://github.com/openresty/lua-cjson/compare/2.1.0.13...openresty:master
5757
export LUA_CJSON_VERSION=2.1.0.13
5858

59-
# Check for recent changes: https://github.com/leev/ngx_http_geoip2_module/compare/3.4...master
59+
# Check for recent changes: https://github.com/leev/ngx_http_geoip2_module/compare/a607a41a8115fecfc05b5c283c81532a3d605425...master
6060
export GEOIP2_VERSION=a607a41a8115fecfc05b5c283c81532a3d605425
6161

62-
# Check for recent changes: https://github.com/openresty/luajit2/compare/v2.1-20230410...v2.1-agentzh
63-
export LUAJIT_VERSION=v2.1-20231117
62+
# Check for recent changes: https://github.com/openresty/luajit2/compare/v2.1-20240314...v2.1-agentzh
63+
export LUAJIT_VERSION=v2.1-20240314
6464

65-
# Check for recent changes: https://github.com/openresty/lua-resty-balancer/compare/v0.04...master
65+
# Check for recent changes: https://github.com/openresty/lua-resty-balancer/compare/1cd4363c0a239afe4765ec607dcfbbb4e5900eea...master
6666
export LUA_RESTY_BALANCER=1cd4363c0a239afe4765ec607dcfbbb4e5900eea
6767

68-
# Check for recent changes: https://github.com/openresty/lua-resty-lrucache/compare/v0.13...master
68+
# Check for recent changes: https://github.com/openresty/lua-resty-lrucache/compare/99e7578465b40f36f596d099b82eab404f2b42ed...master
6969
export LUA_RESTY_CACHE=99e7578465b40f36f596d099b82eab404f2b42ed
7070

7171
# Check for recent changes: https://github.com/openresty/lua-resty-core/compare/v0.1.27...master
7272
export LUA_RESTY_CORE=v0.1.28
7373

74-
# Check for recent changes: https://github.com/cloudflare/lua-resty-cookie/compare/v0.1.0...master
74+
# Check for recent changes: https://github.com/cloudflare/lua-resty-cookie/compare/f418d77082eaef48331302e84330488fdc810ef4...master
7575
export LUA_RESTY_COOKIE_VERSION=f418d77082eaef48331302e84330488fdc810ef4
7676

77-
# Check for recent changes: https://github.com/openresty/lua-resty-dns/compare/v0.22...master
77+
# Check for recent changes: https://github.com/openresty/lua-resty-dns/compare/8bb53516e2933e61c317db740a9b7c2048847c2f...master
7878
export LUA_RESTY_DNS=8bb53516e2933e61c317db740a9b7c2048847c2f
7979

80-
# Check for recent changes: https://github.com/ledgetech/lua-resty-http/compare/v0.16.1...master
80+
# Check for recent changes: https://github.com/ledgetech/lua-resty-http/compare/v0.17.1...master
8181
export LUA_RESTY_HTTP=v0.17.1
8282

8383
# Check for recent changes: https://github.com/openresty/lua-resty-lock/compare/v0.09...master
@@ -101,8 +101,8 @@ export LUA_RESTY_IPMATCHER_VERSION=3e93c53eb8c9884efe939ef070486a0e507cc5be
101101
# Check for recent changes: https://github.com/ElvinEfendi/lua-resty-global-throttle/compare/v0.2.0...main
102102
export LUA_RESTY_GLOBAL_THROTTLE_VERSION=v0.2.0
103103

104-
# Check for recent changes: https://github.com/microsoft/mimalloc/compare/v1.7.6...master
105-
export MIMALOC_VERSION=v2.1.2
104+
# Check for recent changes: https://github.com/microsoft/mimalloc/compare/v2.1.7...master
105+
export MIMALOC_VERSION=v2.1.7
106106

107107
# Check on https://github.com/open-telemetry/opentelemetry-cpp
108108
export OPENTELEMETRY_CPP_VERSION="v1.11.0"
@@ -447,6 +447,7 @@ WITH_FLAGS="--with-debug \
447447
--with-http_gzip_static_module \
448448
--with-http_sub_module \
449449
--with-http_v2_module \
450+
--with-http_v3_module \
450451
--with-stream \
451452
--with-stream_ssl_module \
452453
--with-stream_realip_module \

0 commit comments

Comments
 (0)