Skip to content

Commit c65659a

Browse files
committed
feat: Install NAP on all supported platforms (#306)
1 parent 928e5b2 commit c65659a

File tree

5 files changed

+79
-9
lines changed

5 files changed

+79
-9
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ BREAKING CHANGES:
88

99
FEATURES:
1010

11-
- Add support for installing NGINX App Protect WAF on Alpine Linux 3.17, RHEL 9, and Ubuntu jammy.
11+
- Add support for installing NGINX App Protect WAF on Alpine Linux 3.17, Debian bookworm, RHEL 9, and Ubuntu jammy.
12+
- Add support for installing NGINX App Protect DoS on Alpine Linux 3.17, Debian bullseye/bookworm, RHEL 8/9, and Rocky Linux 8.
1213
- Remove support for installing NGINX App Protect WAF/DoS on Alpine Linux 3.15/3.16 and Ubuntu bionic.
1314

1415
ENHANCEMENTS:

molecule/default/molecule.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,15 @@ platforms:
2929
volumes:
3030
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3131
command: /sbin/init
32+
- name: debian-bookworm
33+
image: debian:bookworm-slim
34+
platform: x86_64
35+
dockerfile: ../common/Dockerfile.j2
36+
privileged: true
37+
cgroupns_mode: host
38+
volumes:
39+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
40+
command: /sbin/init
3241
- name: oraclelinux-8
3342
image: oraclelinux:8
3443
platform: x86_64
@@ -39,7 +48,7 @@ platforms:
3948
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4049
command: /usr/sbin/init
4150
- name: rhel-8
42-
image: redhat/ubi8:8.7
51+
image: redhat/ubi8:8.10
4352
platform: x86_64
4453
dockerfile: ../common/Dockerfile.j2
4554
privileged: true
@@ -48,9 +57,7 @@ platforms:
4857
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4958
command: /usr/sbin/init
5059
- name: rhel-9
51-
image: redhat/ubi9:9.1.0
52-
env:
53-
SMDEV_CONTAINER_OFF: "1"
60+
image: redhat/ubi9:9.4
5461
platform: x86_64
5562
dockerfile: ../common/Dockerfile.j2
5663
privileged: true

molecule/dos/molecule.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
driver:
33
name: docker
44
platforms:
5+
- name: alpine-3.17
6+
image: alpine:3.17
7+
platform: x86_64
8+
dockerfile: ../common/Dockerfile.j2
9+
privileged: true
10+
cgroupns_mode: host
11+
volumes:
12+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
13+
command: /sbin/init
514
- name: debian-bullseye
615
image: debian:bullseye-slim
716
platform: x86_64
@@ -11,6 +20,42 @@ platforms:
1120
volumes:
1221
- /sys/fs/cgroup:/sys/fs/cgroup:rw
1322
command: /sbin/init
23+
- name: debian-bookworm
24+
image: debian:bookworm-slim
25+
platform: x86_64
26+
dockerfile: ../common/Dockerfile.j2
27+
privileged: true
28+
cgroupns_mode: host
29+
volumes:
30+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
31+
command: /sbin/init
32+
- name: rhel-8
33+
image: redhat/ubi8:8.10
34+
platform: x86_64
35+
dockerfile: ../common/Dockerfile.j2
36+
privileged: true
37+
cgroupns_mode: host
38+
volumes:
39+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
40+
command: /usr/sbin/init
41+
- name: rhel-9
42+
image: redhat/ubi9:9.4
43+
platform: x86_64
44+
dockerfile: ../common/Dockerfile.j2
45+
privileged: true
46+
cgroupns_mode: host
47+
volumes:
48+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
49+
command: /usr/sbin/init
50+
- name: rockylinux-8
51+
image: rockylinux:8
52+
platform: x86_64
53+
dockerfile: ../common/Dockerfile.j2
54+
privileged: true
55+
cgroupns_mode: host
56+
volumes:
57+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
58+
command: /usr/sbin/init
1459
- name: rhel-8
1560
image: redhat/ubi8:8.7
1661
platform: x86_64
@@ -29,6 +74,15 @@ platforms:
2974
volumes:
3075
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3176
command: /sbin/init
77+
- name: ubuntu-jammy
78+
image: ubuntu:jammy
79+
platform: x86_64
80+
dockerfile: ../common/Dockerfile.j2
81+
privileged: true
82+
cgroupns_mode: host
83+
volumes:
84+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
85+
command: /sbin/init
3286
provisioner:
3387
name: ansible
3488
playbooks:

molecule/uninstall/molecule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ platforms:
1212
- /sys/fs/cgroup:/sys/fs/cgroup:rw
1313
command: /sbin/init
1414
- name: rhel-8
15-
image: registry.access.redhat.com/ubi8/ubi:8.5
15+
image: redhat/ubi8:8.10
1616
platform: x86_64
1717
dockerfile: ../common/Dockerfile.j2
1818
privileged: true

vars/main.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ nginx_app_protect_waf_distributions:
2626
architectures: [x86_64]
2727
debian:
2828
name: Debian
29-
versions: [11]
29+
versions: [11, 12]
3030
architectures: [x86_64]
3131
oraclelinux:
3232
name: Oracle Linux
@@ -43,17 +43,25 @@ nginx_app_protect_waf_distributions:
4343

4444
# Supported NGINX App Protect DoS distributions
4545
nginx_app_protect_dos_distributions:
46+
alpine:
47+
name: Alpine Linux
48+
versions: [3.17]
49+
architectures: [x86_64]
4650
debian:
4751
name: Debian
48-
versions: [11]
52+
versions: [11, 12]
4953
architectures: [x86_64]
5054
redhat:
5155
name: Red Hat Enterprise Linux
56+
versions: [8, 9]
57+
architectures: [x86_64]
58+
rocky:
59+
name: Rocky Linux
5260
versions: [8]
5361
architectures: [x86_64]
5462
ubuntu:
5563
name: Ubuntu
56-
versions: [20.04]
64+
versions: [20.04, 22.04]
5765
architectures: [x86_64]
5866

5967
# Alpine Linux dependencies

0 commit comments

Comments
 (0)