diff --git a/CHANGELOG.md b/CHANGELOG.md index ec8b006..2360eae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,8 @@ BREAKING CHANGES: FEATURES: -- Add support for installing NGINX App Protect WAF on Alpine Linux 3.17, RHEL 9, and Ubuntu jammy. +- Add support for installing NGINX App Protect WAF on Alpine Linux 3.17, Debian bookworm, RHEL 9, and Ubuntu jammy. +- Add support for installing NGINX App Protect DoS on Alpine Linux 3.17, Debian bullseye/bookworm, RHEL 8/9, and Rocky Linux 8. - Remove support for installing NGINX App Protect WAF/DoS on Alpine Linux 3.15/3.16 and Ubuntu bionic. ENHANCEMENTS: diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 50ef8c1..42add8d 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -29,6 +29,15 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: debian-bookworm + image: debian:bookworm-slim + platform: x86_64 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: oraclelinux-8 image: oraclelinux:8 platform: x86_64 @@ -39,7 +48,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.7 + image: redhat/ubi8:8.10 platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true @@ -48,9 +57,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.1.0 - env: - SMDEV_CONTAINER_OFF: "1" + image: redhat/ubi9:9.4 platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true diff --git a/molecule/dos/molecule.yml b/molecule/dos/molecule.yml index 3bafc1e..4f22c45 100644 --- a/molecule/dos/molecule.yml +++ b/molecule/dos/molecule.yml @@ -2,6 +2,15 @@ driver: name: docker platforms: + - name: alpine-3.17 + image: alpine:3.17 + platform: x86_64 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: debian-bullseye image: debian:bullseye-slim platform: x86_64 @@ -11,6 +20,42 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: debian-bookworm + image: debian:bookworm-slim + platform: x86_64 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init + - name: rhel-8 + image: redhat/ubi8:8.10 + platform: x86_64 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /usr/sbin/init + - name: rhel-9 + image: redhat/ubi9:9.4 + platform: x86_64 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /usr/sbin/init + - name: rockylinux-8 + image: rockylinux:8 + platform: x86_64 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 platform: x86_64 @@ -29,6 +74,15 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: ubuntu-jammy + image: ubuntu:jammy + platform: x86_64 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init provisioner: name: ansible playbooks: diff --git a/molecule/uninstall/molecule.yml b/molecule/uninstall/molecule.yml index 4705bdf..4de4b50 100644 --- a/molecule/uninstall/molecule.yml +++ b/molecule/uninstall/molecule.yml @@ -12,7 +12,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init - name: rhel-8 - image: registry.access.redhat.com/ubi8/ubi:8.5 + image: redhat/ubi8:8.10 platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true diff --git a/vars/main.yml b/vars/main.yml index 569a0d4..92e12f8 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -26,7 +26,7 @@ nginx_app_protect_waf_distributions: architectures: [x86_64] debian: name: Debian - versions: [11] + versions: [11, 12] architectures: [x86_64] oraclelinux: name: Oracle Linux @@ -43,17 +43,25 @@ nginx_app_protect_waf_distributions: # Supported NGINX App Protect DoS distributions nginx_app_protect_dos_distributions: + alpine: + name: Alpine Linux + versions: [3.17] + architectures: [x86_64] debian: name: Debian - versions: [11] + versions: [11, 12] architectures: [x86_64] redhat: name: Red Hat Enterprise Linux + versions: [8, 9] + architectures: [x86_64] + rocky: + name: Rocky Linux versions: [8] architectures: [x86_64] ubuntu: name: Ubuntu - versions: [20.04] + versions: [20.04, 22.04] architectures: [x86_64] # Alpine Linux dependencies