Skip to content

Commit 11166bf

Browse files
javorszkyjavorszky
authored
Update nap to 511 on release branch (#8879)
* Update nap in the dockerfile * Also build the v5 images with all-images * Also update data.json file with new versions
1 parent f51e922 commit 11166bf

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ ubi-image-nap-dos-plus: build ## Create Docker image for Ingress Controller (UBI
248248
.PHONY: all-images ## Create all the Docker images for Ingress Controller
249249
all-images:
250250
docker builder prune -af; \
251-
images="alpine-image alpine-image-plus alpine-image-plus-fips alpine-image-nap-plus-fips debian-image debian-image-plus debian-image-nap-plus debian-image-dos-plus debian-image-nap-dos-plus ubi-image ubi-image-plus ubi-image-nap-plus ubi-image-dos-plus ubi-image-nap-dos-plus"; \
251+
images="alpine-image alpine-image-nap-plus-fips alpine-image-nap-v5-plus-fips alpine-image-plus alpine-image-plus-fips debian-image debian-image-dos-plus debian-image-nap-dos-plus debian-image-nap-plus debian-image-nap-v5-plus debian-image-plus ubi-image ubi-image-dos-plus ubi-image-nap-dos-plus ubi-image-nap-plus ubi-image-nap-v5-plus ubi-image-plus ubi8-image-nap-v5-plus"; \
252252
for img in $$images; do \
253253
TAG="$(strip $(TAG))-$$img" make $$img; \
254254
done

‎build/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ ARG BUILD_OS=debian
33
# renovate: datasource=docker depName=nginx/nginx
44
ARG NGINX_OSS_VERSION=1.29.4
55
ARG NGINX_PLUS_VERSION=R36
6-
ARG NAP_WAF_VERSION=36+5.550
7-
ARG NAP_WAF_COMMON_VERSION=11.583
6+
ARG NAP_WAF_VERSION=36+5.575.0
7+
ARG NAP_WAF_COMMON_VERSION=11.608
88
ARG NAP_WAF_PLUGIN_VERSION=6.25.0
99
ARG NGINX_AGENT_VERSION=3.6
1010
ARG NAP_AGENT_VERSION=2

‎tests/data/modules/data.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@
8080
},
8181
{
8282
"name": "nginx-plus-module-appprotect",
83-
"version": "36+5.550"
83+
"version": "36+5.575"
8484
},
8585
{
8686
"name": "app-protect",
87-
"version": "36+5.550"
87+
"version": "36+5.575"
8888
},
8989
{
9090
"name": "app-protect-attack-signatures",
@@ -126,11 +126,11 @@
126126
},
127127
{
128128
"name": "nginx-plus-module-appprotect",
129-
"version": "36+5.550"
129+
"version": "36+5.575"
130130
},
131131
{
132132
"name": "app-protect-module-plus",
133-
"version": "36+5.550"
133+
"version": "36+5.575"
134134
},
135135
{
136136
"name": "app-protect-plugin",
@@ -202,11 +202,11 @@
202202
},
203203
{
204204
"name": "nginx-plus-module-appprotect",
205-
"version": "36+5.550"
205+
"version": "36+5.575"
206206
},
207207
{
208208
"name": "app-protect",
209-
"version": "36+5.550"
209+
"version": "36+5.575"
210210
},
211211
{
212212
"name": "app-protect-attack-signatures",
@@ -349,11 +349,11 @@
349349
},
350350
{
351351
"name": "nginx-plus-module-appprotect",
352-
"version": "36.5.550"
352+
"version": "36.5.575"
353353
},
354354
{
355355
"name": "app-protect",
356-
"version": "36.5.550"
356+
"version": "36.5.575"
357357
},
358358
{
359359
"name": "app-protect-attack-signatures",
@@ -395,11 +395,11 @@
395395
},
396396
{
397397
"name": "nginx-plus-module-appprotect",
398-
"version": "36.5.550"
398+
"version": "36.5.575"
399399
},
400400
{
401401
"name": "app-protect-module-plus",
402-
"version": "36.5.550"
402+
"version": "36.5.575"
403403
},
404404
{
405405
"name": "app-protect-plugin",
@@ -495,11 +495,11 @@
495495
},
496496
{
497497
"name": "nginx-plus-module-appprotect",
498-
"version": "36+5.550"
498+
"version": "36+5.575"
499499
},
500500
{
501501
"name": "app-protect",
502-
"version": "36+5.550"
502+
"version": "36+5.575"
503503
},
504504
{
505505
"name": "app-protect-attack-signatures",
@@ -541,11 +541,11 @@
541541
},
542542
{
543543
"name": "nginx-plus-module-appprotect",
544-
"version": "36+5.550"
544+
"version": "36+5.575"
545545
},
546546
{
547547
"name": "app-protect-module-plus",
548-
"version": "36+5.550"
548+
"version": "36+5.575"
549549
},
550550
{
551551
"name": "app-protect-plugin",
@@ -583,11 +583,11 @@
583583
},
584584
{
585585
"name": "nginx-plus-module-appprotect",
586-
"version": "36+5.550"
586+
"version": "36+5.575"
587587
},
588588
{
589589
"name": "app-protect",
590-
"version": "36+5.550"
590+
"version": "36+5.575"
591591
},
592592
{
593593
"name": "app-protect-attack-signatures",
@@ -629,11 +629,11 @@
629629
},
630630
{
631631
"name": "nginx-plus-module-appprotect",
632-
"version": "36+5.550"
632+
"version": "36+5.575"
633633
},
634634
{
635635
"name": "app-protect-module-plus",
636-
"version": "36+5.550"
636+
"version": "36+5.575"
637637
},
638638
{
639639
"name": "app-protect-plugin",
@@ -701,7 +701,7 @@
701701
},
702702
{
703703
"name": "nginx-plus-module-appprotect",
704-
"version": "36+5.550"
704+
"version": "36+5.575"
705705
},
706706
{
707707
"name": "nginx-plus-module-appprotectdos",
@@ -713,7 +713,7 @@
713713
},
714714
{
715715
"name": "app-protect",
716-
"version": "36+5.550"
716+
"version": "36+5.575"
717717
},
718718
{
719719
"name": "app-protect-attack-signatures",

0 commit comments

Comments
 (0)