Skip to content

Commit 3907ef8

Browse files
authored
Add Alpine Linux 3.16 as a supported platform (#524)
1 parent e897a1e commit 3907ef8

File tree

6 files changed

+33
-32
lines changed

6 files changed

+33
-32
lines changed

CHANGELOG.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ FEATURES:
66

77
* Add support for NGINX OSS on Ubuntu jammy (22.04).
88
* Add CODEOWNERS file.
9-
* Add support for NGINX OSS on RHEL 9.
9+
* Add RHEL 9 to the NGINX OSS list of tested and supported platforms.
10+
* Add Alpine Linux 3.16 to the NGINX OSS list of tested and supported platforms (and remove Alpine Linux 3.12).
1011

1112
ENHANCEMENTS:
1213

@@ -48,10 +49,10 @@ FEATURES:
4849

4950
* Backwards support for older versions of Ansible (e.g. Ansible `<2.12`).
5051
* Update NGINX Amplify repositories to use Python 3 when possible.
52+
* Add Alpine Linux 3.15 to the NGINX Plus list of tested and supported platforms (and remove Alpine Linux 3.11).
5153

5254
ENHANCEMENTS:
5355

54-
* Add Alpine Linux 3.15 to the NGINX Plus list of tested and supported platforms (and remove Alpine Linux 3.11).
5556
* Use `pcre2` by default when possible.
5657
* Bump the Ansible `community.general` collection to `4.4.0` and `community.docker` collection to `2.1.1`.
5758

@@ -72,10 +73,10 @@ FEATURES:
7273

7374
* Pin repository data when installing NGINX OSS on Alpine and Debian distributions.
7475
* You can now downgrade versions of NGINX and switch from stable to mainline and viceversa. You will need to specify the NGINX branch and version you wish to install when tweaking versions.
76+
* Add Alpine Linux 3.15 to the NGINX OSS list of tested and supported platforms (and remove Alpine Linux 3.11).
7577

7678
ENHANCEMENTS:
7779

78-
* Add Alpine Linux 3.15 to the NGINX OSS list of tested and supported platforms (and remove Alpine Linux 3.11).
7980
* Bump the Ansible `community.general` collection to `4.1.0` and `community.docker` collection to `2.0.2`.
8081

8182
BUG FIXES:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ The NGINX Ansible role supports all platforms supported by [NGINX Open Source](h
7373

7474
```yaml
7575
Alpine:
76-
- 3.12
7776
- 3.13
7877
- 3.14
7978
- 3.15
79+
- 3.16
8080
Amazon Linux:
8181
- 2
8282
CentOS:

molecule/default/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.12
10-
image: alpine:3.12
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.13
1710
image: alpine:3.13
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.16
31+
image: alpine:3.16
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/module/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.12
10-
image: alpine:3.12
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.13
1710
image: alpine:3.13
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.16
31+
image: alpine:3.16
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/source/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.12
10-
image: alpine:3.12
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.13
1710
image: alpine:3.13
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.16
31+
image: alpine:3.16
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/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.12
10-
image: alpine:3.12
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.13
1710
image: alpine:3.13
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.16
31+
image: alpine:3.16
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

0 commit comments

Comments
 (0)