Skip to content

Commit a63b827

Browse files
dependabot[bot]dependabot[bot]
authored
Bump molecule[docker] from 3.6.0 to 3.6.1 in /.github/workflows/requirements (#488)
1 parent 121433d commit a63b827

File tree

7 files changed

+41
-33
lines changed

7 files changed

+41
-33
lines changed

‎.github/workflows/requirements/requirements_molecule.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ ansible-core==2.12.2
22
jinja2==3.0.3
33
ansible-lint==5.3.2
44
yamllint==1.26.3
5-
molecule[docker]==3.6.0
5+
molecule[docker]==3.6.1
66
docker==5.0.3

‎CHANGELOG.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@
44

55
BREAKING CHANGES:
66

7-
CentOS 8 has reached EoL and has thus been removed from the list of supported platforms.
7+
* CentOS 8 has reached EoL and has thus been removed from the list of supported platforms.
8+
* The NGINX Plus `cookie-flag` module is no longer supported as of R26 and has been removed.
89

910
FEATURES:
1011

11-
Support for ansible-base (ansible-core `<2.12`).
12+
Backwards support for older versions of Ansible (e.g. Ansible `<2.12`).
13+
14+
ENHANCEMENTS:
15+
16+
* Add Alpine Linux 3.15 to the NGINX Plus list of tested and supported platforms (and remove Alpine Linux 3.11).
17+
* Use `pcre2` by default when possible.
1218

1319
BUG FIXES:
1420

@@ -30,8 +36,8 @@ FEATURES:
3036

3137
ENHANCEMENTS:
3238

33-
* Add Alpine Linux 3.15 to list of tested and supported platforms.
34-
* Bump the Ansible `community.general` collection to `4.2.0` and `community.docker` collection to `2.0.2`.
39+
* Add Alpine Linux 3.15 to the NGINX OSS list of tested and supported platforms (and remove Alpine Linux 3.11).
40+
* Bump the Ansible `community.general` collection to `4.1.0` and `community.docker` collection to `2.0.2`.
3541

3642
BUG FIXES:
3743

‎molecule/plus/converge.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
nginx_modules:
1515
- auth-spnego
1616
- brotli
17-
- cookie-flag
1817
- encrypted-session
1918
- geoip
20-
- "{{ ansible_facts['distribution'] == 'Amazon' | ternary('', 'geoip2') }}"
19+
- geoip2
2120
- headers-more
2221
- image-filter
2322
- lua
2423
- njs
25-
- "{{ ansible_facts['distribution'] == 'Amazon' | ternary('', 'opentracing') }}"
24+
- opentracing
2625
- passenger
2726
- perl
2827
- prometheus

‎molecule/plus/molecule.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ lint: |
66
yamllint .
77
ansible-lint --force-color
88
platforms:
9-
- name: alpine-3.11
10-
image: alpine:3.11
11-
dockerfile: ../common/Dockerfile.j2
12-
privileged: true
13-
volumes:
14-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
15-
command: "/sbin/init"
169
- name: alpine-3.12
1710
image: alpine:3.12
1811
dockerfile: ../common/Dockerfile.j2
@@ -34,6 +27,13 @@ platforms:
3427
volumes:
3528
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
3629
command: "/sbin/init"
30+
- name: alpine-3.15
31+
image: alpine:3.15
32+
dockerfile: ../common/Dockerfile.j2
33+
privileged: true
34+
volumes:
35+
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
36+
command: "/sbin/init"
3737
- name: amazonlinux-2
3838
image: amazonlinux:2
3939
dockerfile: ../common/Dockerfile.j2

‎molecule/uninstall_plus/molecule.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ lint: |
66
yamllint .
77
ansible-lint --force-color
88
platforms:
9-
- name: alpine-3.11
10-
image: alpine:3.11
11-
dockerfile: ../common/Dockerfile.j2
12-
privileged: true
13-
volumes:
14-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
15-
command: "/sbin/init"
169
- name: alpine-3.12
1710
image: alpine:3.12
1811
dockerfile: ../common/Dockerfile.j2
@@ -34,6 +27,13 @@ platforms:
3427
volumes:
3528
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
3629
command: "/sbin/init"
30+
- name: alpine-3.15
31+
image: alpine:3.15
32+
dockerfile: ../common/Dockerfile.j2
33+
privileged: true
34+
volumes:
35+
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
36+
command: "/sbin/init"
3737
- name: amazonlinux-2
3838
image: amazonlinux:2
3939
dockerfile: ../common/Dockerfile.j2

‎tasks/modules/install-modules.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,19 @@
1818
or (item.name | default(item) in nginx_plus_modules_list and nginx_type == 'plus')
1919
- not (item.name | default(item) == "auth-spnego")
2020
or not (ansible_facts['os_family'] == "Alpine" and (ansible_facts['distribution_version'] | regex_search('^[0-9]+\\.[0-9]+') is version('3.8', '==')))
21-
- not (item.name | default(item) == "geoip")
22-
or not ((ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('8', '=='))
23-
or (ansible_facts['os_family'] == "FreeBSD"))
2421
- not (item.name | default(item) == "brotli")
2522
or not ((ansible_facts['os_family'] == "Alpine")
26-
or (ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('8', '<'))
27-
or (ansible_facts['os_family'] == "Debian" and ansible_facts['distribution_major_version'] is version('9', '=='))
28-
or (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '<'))
2923
or (ansible_facts['distribution'] == "Amazon")
30-
or (ansible_facts['distribution'] == "OracleLinux"))
31-
- not (item.name | default(item) == "geoip2") or not (ansible_facts['os_family'] == "Suse")
24+
or (ansible_facts['os_family'] == "Debian" and ansible_facts['distribution_major_version'] is version('9', '=='))
25+
or (ansible_facts['distribution'] == "OracleLinux")
26+
or (ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('8', '<'))
27+
or (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '<')))
28+
- not (item.name | default(item) == "geoip")
29+
or not ((ansible_facts['os_family'] == "FreeBSD")
30+
or (ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('8', '==')))
31+
- not (item.name | default(item) == "geoip2")
32+
or not ((ansible_facts['distribution'] == 'Amazon')
33+
or (ansible_facts['os_family'] == "Suse"))
3234
- not (item.name | default(item) == "opentracing")
33-
or not (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '=='))
35+
or not ((ansible_facts['distribution'] == 'Amazon')
36+
or (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '==')))

‎vars/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ nginx_plus_default_repository_suse: "https://pkgs.nginx.com/plus/sles/{{ ansible
5757

5858
# Alpine dependencies
5959
nginx_alpine_dependencies: [
60-
'ca-certificates', 'coreutils', 'openssl', 'pcre',
60+
'ca-certificates', 'coreutils', 'openssl', 'pcre2',
6161
]
6262

6363
# Debian dependencies
@@ -92,6 +92,6 @@ nginx_modules_list: [
9292

9393
# Supported NGINX Plus dynamic modules
9494
nginx_plus_modules_list: [
95-
'auth-spnego', 'brotli', 'cookie-flag', 'encrypted-session', 'geoip', 'geoip2', 'headers-more', 'image-filter',
95+
'auth-spnego', 'brotli', 'encrypted-session', 'geoip', 'geoip2', 'headers-more', 'image-filter',
9696
'lua', 'njs', 'opentracing', 'passenger', 'perl', 'prometheus', 'rtmp', 'subs-filter', 'xslt',
9797
]

0 commit comments

Comments
 (0)