Skip to content

Commit 14dad99

Browse files
authored
Add support for NGINX OSS on Ubuntu jammy (#512)
1 parent acf07a3 commit 14dad99

File tree

9 files changed

+39
-5
lines changed

9 files changed

+39
-5
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## 0.23.2 (Unreleased)
44

5+
FEATURES:
6+
7+
Add support for NGINX OSS on Ubuntu jammy (22.04).
8+
59
BUG FIXES:
610

711
* Ensure gpg-agent is installed on Ubuntu/Debian to avoid APT key tasks failures.

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ Ubuntu:
9494
- bionic (18.04)
9595
- focal (20.04)
9696
- impish (21.10)
97+
- jammy (22.04)
9798
```
9899

99100
### NGINX Plus

meta/main.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ galaxy_info:
3232
versions:
3333
- bionic
3434
- focal
35-
- hirsute
35+
- impish
36+
- jammy
3637
- name: SLES
3738
versions:
3839
- 12

molecule/default/converge.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
pre_tasks:
55
- name: Set repo if Alpine
66
ansible.builtin.set_fact:
7-
version: "=1.21.5-r1"
7+
version: "=1.21.6-r1"
88
when: ansible_facts['os_family'] == "Alpine"
99
- name: Set repo if Debian
1010
ansible.builtin.set_fact:
11-
version: "=1.21.5-1~{{ ansible_facts['distribution_release'] }}"
11+
version: "=1.21.6-1~{{ ansible_facts['distribution_release'] }}"
1212
when: ansible_facts['os_family'] == "Debian"
1313
- name: Set repo if Red Hat
1414
ansible.builtin.set_fact:
15-
version: "-1.21.5-1.{{ (ansible_facts['distribution'] == 'Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx"
15+
version: "-1.21.6-1.{{ (ansible_facts['distribution'] == 'Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx"
1616
when: ansible_facts['os_family'] == "RedHat"
1717
tasks:
1818
- name: Install NGINX

molecule/default/molecule.yml

+7
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,13 @@ platforms:
9090
volumes:
9191
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
9292
command: "/sbin/init"
93+
- name: ubuntu-jammy
94+
image: ubuntu:jammy
95+
dockerfile: ../common/Dockerfile.j2
96+
privileged: true
97+
volumes:
98+
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
99+
command: "/sbin/init"
93100
provisioner:
94101
name: ansible
95102
playbooks:

molecule/default/verify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030
chdir: "{{ ((ansible_facts['system'] | lower is not search('bsd')) | ternary('/etc/nginx', '/usr/local/sbin')) }}"
3131
changed_when: false
3232
register: version
33-
failed_when: version is not search('1.21.5')
33+
failed_when: version is not search('1.21.6')

molecule/module/molecule.yml

+7
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,13 @@ platforms:
9090
volumes:
9191
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
9292
command: "/sbin/init"
93+
- name: ubuntu-jammy
94+
image: ubuntu:jammy
95+
dockerfile: ../common/Dockerfile.j2
96+
privileged: true
97+
volumes:
98+
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
99+
command: "/sbin/init"
93100
provisioner:
94101
name: ansible
95102
playbooks:

molecule/source/molecule.yml

+7
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,13 @@ platforms:
9090
volumes:
9191
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
9292
command: "/sbin/init"
93+
- name: ubuntu-jammy
94+
image: ubuntu:jammy
95+
dockerfile: ../common/Dockerfile.j2
96+
privileged: true
97+
volumes:
98+
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
99+
command: "/sbin/init"
93100
provisioner:
94101
name: ansible
95102
playbooks:

molecule/uninstall/molecule.yml

+7
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,13 @@ platforms:
9090
volumes:
9191
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
9292
command: "/sbin/init"
93+
- name: ubuntu-jammy
94+
image: ubuntu:jammy
95+
dockerfile: ../common/Dockerfile.j2
96+
privileged: true
97+
volumes:
98+
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
99+
command: "/sbin/init"
93100
provisioner:
94101
name: ansible
95102
playbooks:

0 commit comments

Comments
 (0)