Skip to content

Commit f0ec588

Browse files
alessfgalessfg
authored
Update list of supported NGINX versions (#719)
1 parent cb9b366 commit f0ec588

File tree

22 files changed

+188
-72
lines changed

22 files changed

+188
-72
lines changed

‎CHANGELOG.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
FEATURES:
66

77
- Implement the ability to install the NGINX Agent.
8-
- Add Amazon Linux 2023 and Alpine Linux 3.19 to the list of NGINX Open Source and NGINX Plus tested and supported distributions.
9-
- Remove Alpine Linux 3.15 from the list of NGINX Open Source and NGINX Plus tested and supported distributions.
8+
- Add Amazon Linux 2023, Alpine Linux 3.19 and Ubuntu noble to the list of NGINX OSS and NGINX Plus tested and supported distributions.
9+
- Add Ubuntu matic to the list of supported NGINX OSS distributions.
10+
- Remove Ubuntu lunar from the list of supported NGINX OSS distributions.
11+
- Remove Alpine Linux 3.15 from the list of NGINX OSS and NGINX Plus tested and supported distributions.
1012

1113
ENHANCEMENTS:
1214

‎README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ SUSE/SLES:
141141
Ubuntu:
142142
- focal (20.04)
143143
- jammy (22.04)
144-
- lunar (23.04)
144+
- mantic (23.10)
145+
- noble (24.04)
145146
```
146147

147148
### NGINX Plus
@@ -184,6 +185,7 @@ SUSE/SLES:
184185
Ubuntu:
185186
- focal (20.04)
186187
- jammy (22.04)
188+
- noble (24.04)
187189
```
188190

189191
### NGINX Agent

‎molecule/default/molecule.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,16 @@ platforms:
189189
volumes:
190190
- /sys/fs/cgroup:/sys/fs/cgroup:rw
191191
command: /sbin/init
192-
- name: ubuntu-lunar
193-
image: ubuntu:lunar
192+
- name: ubuntu-mantic
193+
image: ubuntu:mantic
194+
dockerfile: ../common/Dockerfile.j2
195+
privileged: true
196+
cgroupns_mode: host
197+
volumes:
198+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
199+
command: /sbin/init
200+
- name: ubuntu-noble
201+
image: ubuntu:noble
194202
dockerfile: ../common/Dockerfile.j2
195203
privileged: true
196204
cgroupns_mode: host

‎molecule/distribution/molecule.yml

+16
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,22 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
198198
volumes:
199199
- /sys/fs/cgroup:/sys/fs/cgroup:rw
200200
command: /sbin/init
201+
- name: ubuntu-mantic
202+
image: ubuntu:mantic
203+
dockerfile: ../common/Dockerfile.j2
204+
privileged: true
205+
cgroupns_mode: host
206+
volumes:
207+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
208+
command: /sbin/init
209+
- name: ubuntu-noble
210+
image: ubuntu:noble
211+
dockerfile: ../common/Dockerfile.j2
212+
privileged: true
213+
cgroupns_mode: host
214+
volumes:
215+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
216+
command: /sbin/init
201217
provisioner:
202218
name: ansible
203219
log: true

‎molecule/downgrade-plus/converge.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
pre_tasks:
55
- name: Set repo if Alpine
66
ansible.builtin.set_fact:
7-
version: =30-r1
7+
version: =31-r1
88
cacheable: true
99
when: ansible_facts['os_family'] == "Alpine"
1010
- name: Set repo if Debian
1111
ansible.builtin.set_fact:
12-
version: =30-1~{{ ansible_facts['distribution_release'] }}
12+
version: =31-1~{{ ansible_facts['distribution_release'] }}
1313
cacheable: true
1414
when: ansible_facts['os_family'] == "Debian"
1515
- name: Set repo if Red Hat
1616
ansible.builtin.set_fact:
17-
version: -30-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
17+
version: -31-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
1818
cacheable: true
1919
when: ansible_facts['os_family'] == "RedHat"
2020
- name: Set repo if SLES
2121
ansible.builtin.set_fact:
22-
version: =30-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
22+
version: =31-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
2323
cacheable: true
2424
when: ansible_facts['os_family'] == "Suse"
2525
tasks:

‎molecule/downgrade-plus/molecule.yml

+17-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
driver:
33
name: docker
4-
platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the moment) so it's impossible to test the downgrade scenario
4+
platforms: # Ubuntu noble only has one version of NGINX Plus available (at the moment) so it's impossible to test the downgrade scenario
55
- name: almalinux-8
66
image: almalinux:8
77
dockerfile: ../common/Dockerfile.j2
@@ -44,14 +44,14 @@ platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the mo
4444
volumes:
4545
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4646
command: /sbin/init
47-
# - name: alpine-3.19
48-
# image: alpine:3.19
49-
# dockerfile: ../common/Dockerfile.j2
50-
# privileged: true
51-
# cgroupns_mode: host
52-
# volumes:
53-
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
54-
# command: /sbin/init
47+
- name: alpine-3.19
48+
image: alpine:3.19
49+
dockerfile: ../common/Dockerfile.j2
50+
privileged: true
51+
cgroupns_mode: host
52+
volumes:
53+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
54+
command: /sbin/init
5555
- name: amazonlinux-2
5656
image: amazonlinux:2
5757
platform: x86_64
@@ -189,6 +189,14 @@ platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the mo
189189
volumes:
190190
- /sys/fs/cgroup:/sys/fs/cgroup:rw
191191
command: /sbin/init
192+
# - name: ubuntu-noble
193+
# image: ubuntu:noble
194+
# dockerfile: ../common/Dockerfile.j2
195+
# privileged: true
196+
# cgroupns_mode: host
197+
# volumes:
198+
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
199+
# command: /sbin/init
192200
provisioner:
193201
name: ansible
194202
playbooks:

‎molecule/downgrade/converge.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
pre_tasks:
55
- name: Set repo if Alpine
66
ansible.builtin.set_fact:
7-
version: =1.25.3-r1
7+
version: =1.25.5-r1
88
cacheable: true
99
when: ansible_facts['os_family'] == "Alpine"
1010
- name: Set repo if Debian
1111
ansible.builtin.set_fact:
12-
version: =1.25.3-1~{{ ansible_facts['distribution_release'] }}
12+
version: =1.25.5-1~{{ ansible_facts['distribution_release'] }}
1313
cacheable: true
1414
when: ansible_facts['os_family'] == "Debian"
1515
- name: Set repo if Red Hat
1616
ansible.builtin.set_fact:
17-
version: -1.25.3-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
17+
version: -1.25.5-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
1818
cacheable: true
1919
when: ansible_facts['os_family'] == "RedHat"
2020
- name: Set repo if SLES
2121
ansible.builtin.set_fact:
22-
version: =1.25.3-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
22+
version: =1.25.5-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
2323
cacheable: true
2424
when: ansible_facts['os_family'] == "Suse"
2525
tasks:

‎molecule/downgrade/molecule.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,16 @@ platforms:
189189
volumes:
190190
- /sys/fs/cgroup:/sys/fs/cgroup:rw
191191
command: /sbin/init
192-
- name: ubuntu-lunar
193-
image: ubuntu:lunar
192+
- name: ubuntu-mantic
193+
image: ubuntu:mantic
194+
dockerfile: ../common/Dockerfile.j2
195+
privileged: true
196+
cgroupns_mode: host
197+
volumes:
198+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
199+
command: /sbin/init
200+
- name: ubuntu-noble
201+
image: ubuntu:noble
194202
dockerfile: ../common/Dockerfile.j2
195203
privileged: true
196204
cgroupns_mode: host

‎molecule/plus/molecule.yml

+8
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,14 @@ platforms:
189189
volumes:
190190
- /sys/fs/cgroup:/sys/fs/cgroup:rw
191191
command: /sbin/init
192+
- name: ubuntu-noble
193+
image: ubuntu:noble
194+
dockerfile: ../common/Dockerfile.j2
195+
privileged: true
196+
cgroupns_mode: host
197+
volumes:
198+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
199+
command: /sbin/init
192200
provisioner:
193201
name: ansible
194202
playbooks:

‎molecule/source-version/molecule.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,16 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
180180
volumes:
181181
- /sys/fs/cgroup:/sys/fs/cgroup:rw
182182
command: /sbin/init
183-
- name: ubuntu-lunar
184-
image: ubuntu:lunar
183+
- name: ubuntu-mantic
184+
image: ubuntu:mantic
185+
dockerfile: ../common/Dockerfile.j2
186+
privileged: true
187+
cgroupns_mode: host
188+
volumes:
189+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
190+
command: /sbin/init
191+
- name: ubuntu-noble
192+
image: ubuntu:noble
185193
dockerfile: ../common/Dockerfile.j2
186194
privileged: true
187195
cgroupns_mode: host

‎molecule/source/molecule.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,16 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
180180
volumes:
181181
- /sys/fs/cgroup:/sys/fs/cgroup:rw
182182
command: /sbin/init
183-
- name: ubuntu-lunar
184-
image: ubuntu:lunar
183+
- name: ubuntu-mantic
184+
image: ubuntu:mantic
185+
dockerfile: ../common/Dockerfile.j2
186+
privileged: true
187+
cgroupns_mode: host
188+
volumes:
189+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
190+
command: /sbin/init
191+
- name: ubuntu-noble
192+
image: ubuntu:noble
185193
dockerfile: ../common/Dockerfile.j2
186194
privileged: true
187195
cgroupns_mode: host

‎molecule/stable/molecule.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,16 @@ platforms:
189189
volumes:
190190
- /sys/fs/cgroup:/sys/fs/cgroup:rw
191191
command: /sbin/init
192-
- name: ubuntu-lunar
193-
image: ubuntu:lunar
192+
- name: ubuntu-mantic
193+
image: ubuntu:mantic
194+
dockerfile: ../common/Dockerfile.j2
195+
privileged: true
196+
cgroupns_mode: host
197+
volumes:
198+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
199+
command: /sbin/init
200+
- name: ubuntu-noble
201+
image: ubuntu:noble
194202
dockerfile: ../common/Dockerfile.j2
195203
privileged: true
196204
cgroupns_mode: host

‎molecule/uninstall-plus/molecule.yml

+8
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,14 @@ platforms:
189189
volumes:
190190
- /sys/fs/cgroup:/sys/fs/cgroup:rw
191191
command: /sbin/init
192+
- name: ubuntu-noble
193+
image: ubuntu:noble
194+
dockerfile: ../common/Dockerfile.j2
195+
privileged: true
196+
cgroupns_mode: host
197+
volumes:
198+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
199+
command: /sbin/init
192200
provisioner:
193201
name: ansible
194202
playbooks:

‎molecule/uninstall/molecule.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,16 @@ platforms:
189189
volumes:
190190
- /sys/fs/cgroup:/sys/fs/cgroup:rw
191191
command: /sbin/init
192-
- name: ubuntu-lunar
193-
image: ubuntu:lunar
192+
- name: ubuntu-mantic
193+
image: ubuntu:mantic
194+
dockerfile: ../common/Dockerfile.j2
195+
privileged: true
196+
cgroupns_mode: host
197+
volumes:
198+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
199+
command: /sbin/init
200+
- name: ubuntu-noble
201+
image: ubuntu:noble
194202
dockerfile: ../common/Dockerfile.j2
195203
privileged: true
196204
cgroupns_mode: host

‎molecule/upgrade-plus/molecule.yml

+17-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
driver:
33
name: docker
4-
platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the moment) so it's impossible to test the downgrade scenario
4+
platforms: # Ubuntu noble only has one version of NGINX Plus available (at the moment) so it's impossible to test the downgrade scenario
55
- name: almalinux-8
66
image: almalinux:8
77
dockerfile: ../common/Dockerfile.j2
@@ -44,14 +44,14 @@ platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the mo
4444
volumes:
4545
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4646
command: /sbin/init
47-
# - name: alpine-3.19
48-
# image: alpine:3.19
49-
# dockerfile: ../common/Dockerfile.j2
50-
# privileged: true
51-
# cgroupns_mode: host
52-
# volumes:
53-
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
54-
# command: /sbin/init
47+
- name: alpine-3.19
48+
image: alpine:3.19
49+
dockerfile: ../common/Dockerfile.j2
50+
privileged: true
51+
cgroupns_mode: host
52+
volumes:
53+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
54+
command: /sbin/init
5555
- name: amazonlinux-2
5656
image: amazonlinux:2
5757
platform: x86_64
@@ -189,6 +189,14 @@ platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the mo
189189
volumes:
190190
- /sys/fs/cgroup:/sys/fs/cgroup:rw
191191
command: /sbin/init
192+
# - name: ubuntu-noble
193+
# image: ubuntu:noble
194+
# dockerfile: ../common/Dockerfile.j2
195+
# privileged: true
196+
# cgroupns_mode: host
197+
# volumes:
198+
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
199+
# command: /sbin/init
192200
provisioner:
193201
name: ansible
194202
playbooks:

‎molecule/upgrade-plus/prepare.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@
2222
pre_tasks:
2323
- name: Set repo if Alpine
2424
ansible.builtin.set_fact:
25-
version: =30-r1
25+
version: =31-r1
2626
when: ansible_facts['os_family'] == "Alpine"
2727
- name: Set repo if Debian
2828
ansible.builtin.set_fact:
29-
version: =30-1~{{ ansible_facts['distribution_release'] }}
29+
version: =31-1~{{ ansible_facts['distribution_release'] }}
3030
when: ansible_facts['os_family'] == "Debian"
3131
- name: Set repo if Red Hat
3232
ansible.builtin.set_fact:
33-
version: -30-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
33+
version: -31-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
3434
when: ansible_facts['os_family'] == "RedHat"
3535
- name: Set repo if SLES
3636
ansible.builtin.set_fact:
37-
version: =30-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
37+
version: =31-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
3838
when: ansible_facts['os_family'] == "Suse"
3939
tasks:
4040
- name: Install NGINX

‎molecule/upgrade/molecule.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,16 @@ platforms:
189189
volumes:
190190
- /sys/fs/cgroup:/sys/fs/cgroup:rw
191191
command: /sbin/init
192-
- name: ubuntu-lunar
193-
image: ubuntu:lunar
192+
- name: ubuntu-mantic
193+
image: ubuntu:mantic
194+
dockerfile: ../common/Dockerfile.j2
195+
privileged: true
196+
cgroupns_mode: host
197+
volumes:
198+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
199+
command: /sbin/init
200+
- name: ubuntu-noble
201+
image: ubuntu:noble
194202
dockerfile: ../common/Dockerfile.j2
195203
privileged: true
196204
cgroupns_mode: host

0 commit comments

Comments
 (0)