Skip to content

Commit 3011c25

Browse files
authored
update nginx oss and alpine base (#8736)
1 parent 3a82a5a commit 3011c25

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ VER = $(shell grep IC_VERSION .github/data/version.txt | cut -d '=' -f 2)
33
GIT_TAG = $(shell git describe --exact-match --tags || echo untagged)
44
VERSION = $(VER)-SNAPSHOT
55
# renovate: datasource=docker depName=nginx/nginx
6-
NGINX_OSS_VERSION ?= 1.29.3
6+
NGINX_OSS_VERSION ?= 1.29.4
77
NGINX_PLUS_VERSION ?= R36
88
NAP_WAF_VERSION ?= 36+5.550
99
NAP_WAF_COMMON_VERSION ?= 11.583

build/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1.20
22
ARG BUILD_OS=debian
33
# renovate: datasource=docker depName=nginx/nginx
4-
ARG NGINX_OSS_VERSION=1.29.3
4+
ARG NGINX_OSS_VERSION=1.29.4
55
ARG NGINX_PLUS_VERSION=R36
66
ARG NAP_WAF_VERSION=36+5.550
77
ARG NAP_WAF_COMMON_VERSION=11.583
@@ -87,7 +87,7 @@ USER 101
8787

8888

8989
############################################# Base image for Alpine #############################################
90-
FROM nginx:1.29.3-alpine3.22@sha256:b3c656d55d7ad751196f21b7fd2e8d4da9cb430e32f646adcf92441b72f82b14 AS alpine
90+
FROM nginx:1.29.4-alpine3.23@sha256:052b75ab72f690f33debaa51c7e08d9b969a0447a133eb2b99cc905d9188cb2b AS alpine
9191
ARG PACKAGE_REPO
9292
ARG NGINX_OSS_VERSION
9393
ARG NGINX_AGENT_VERSION
@@ -106,7 +106,7 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.rsa.pub,target=/etc/apk
106106

107107

108108
############################################# Base image for Debian #############################################
109-
FROM nginx:1.29.3@sha256:2f4e10193b0c4f61472245e9d26cea78e7df7af266c7e7cf5e67353ee2731b51 AS debian
109+
FROM nginx:1.29.4@sha256:fb01117203ff38c2f9af91db1a7409459182a37c87cced5cb442d1d8fcc66d19 AS debian
110110
ARG NGINX_OSS_VERSION
111111
ARG NGINX_AGENT_VERSION
112112

tests/data/modules/data.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
"packages": [
77
{
88
"name": "nginx",
9-
"version": "1.29.3"
9+
"version": "1.29.4"
1010
},
1111
{
1212
"name": "nginx-module-njs",
13-
"version": "1.29.3"
13+
"version": "1.29.4"
1414
},
1515
{
1616
"name": "nginx-module-otel",
17-
"version": "1.29.3"
17+
"version": "1.29.4"
1818
},
1919
{
2020
"name": "nginx-agent",
@@ -240,15 +240,15 @@
240240
"packages": [
241241
{
242242
"name": "nginx",
243-
"version": "1.29.3"
243+
"version": "1.29.4"
244244
},
245245
{
246246
"name": "nginx-module-njs",
247-
"version": "1.29.3"
247+
"version": "1.29.4"
248248
},
249249
{
250250
"name": "nginx-module-otel",
251-
"version": "1.29.3"
251+
"version": "1.29.4"
252252
},
253253
{
254254
"name": "nginx-agent",
@@ -417,15 +417,15 @@
417417
"packages": [
418418
{
419419
"name": "nginx",
420-
"version": "1.29.3"
420+
"version": "1.29.4"
421421
},
422422
{
423423
"name": "nginx-module-njs",
424-
"version": "1.29.3"
424+
"version": "1.29.4"
425425
},
426426
{
427427
"name": "nginx-module-otel",
428-
"version": "1.29.3"
428+
"version": "1.29.4"
429429
},
430430
{
431431
"name": "nginx-agent",

0 commit comments

Comments
 (0)