Skip to content

Commit 161f704

Browse files
committed
feat!: Remove Alpine 3.17 and add Alpine 3.21
1 parent 987c2c4 commit 161f704

File tree

16 files changed

+117
-50
lines changed

16 files changed

+117
-50
lines changed

CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
# Changelog
22

3-
## 0.25.1 (Unreleased)
3+
## 0.26.0 (Unreleased)
4+
5+
BREAKING CHANGES:
6+
7+
- Remove support for installing NGINX Plus on Alpine Linux 3.17.
48

59
FEATURES:
610

11+
- Add support for installing NGINX Open Source and NGINX Plus on Alpine Linux 3.21.
712
- Add a parameter, `nginx_distribution_package`, to override the default NGINX package name when installing NGINX from your distribution/OS repository.
813

914
BUG FIXES:
@@ -28,7 +33,7 @@ BREAKING CHANGES:
2833

2934
DEPRECATION WARNINGS:
3035

31-
- The NGINX Agent features contained in this role will be split into a separate role in the next minor release. If you are using this role to install and configure the NGINX Agent, please switch to the new role once it's available.
36+
- The NGINX Agent features contained in this role will be split into a separate role in the next major release. If you are using this role to install and configure the NGINX Agent, please switch to the new role once it's available.
3237

3338
FEATURES:
3439

molecule/default/molecule.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ platforms:
4242
volumes:
4343
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4444
command: /sbin/init
45+
- name: alpine-3.21
46+
image: alpine:3.22
47+
dockerfile: ../common/Dockerfile.j2
48+
privileged: true
49+
cgroupns_mode: host
50+
volumes:
51+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
52+
command: /sbin/init
4553
- name: amazonlinux-2
4654
image: amazonlinux:2
4755
platform: x86_64

molecule/distribution/molecule.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ platforms:
4242
volumes:
4343
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4444
command: /sbin/init
45+
- name: alpine-3.21
46+
image: alpine:3.21
47+
dockerfile: ../common/Dockerfile.j2
48+
privileged: true
49+
cgroupns_mode: host
50+
volumes:
51+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
52+
command: /sbin/init
4553
- name: amazonlinux-2
4654
image: amazonlinux:2
4755
platform: x86_64

molecule/downgrade-plus/molecule.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
driver:
33
name: docker
4-
platforms: # Alpine Linux 3.20 only has one version of NGINX Plus available (at the moment) so it's impossible to test the downgrade scenario
4+
platforms: # Alpine Linux 3.21 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
@@ -18,33 +18,32 @@ platforms: # Alpine Linux 3.20 only has one version of NGINX Plus available (at
1818
volumes:
1919
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2020
command: /usr/sbin/init
21-
- name: alpine-3.17
22-
image: alpine:3.17
21+
- name: alpine-3.18
22+
image: alpine:3.18
2323
dockerfile: ../common/Dockerfile.j2
2424
privileged: true
2525
cgroupns_mode: host
2626
volumes:
2727
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2828
command: /sbin/init
29-
- name: alpine-3.18
30-
image: alpine:3.18
29+
- name: alpine-3.19
30+
image: alpine:3.19
3131
dockerfile: ../common/Dockerfile.j2
3232
privileged: true
3333
cgroupns_mode: host
3434
volumes:
3535
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3636
command: /sbin/init
37-
- name: alpine-3.19
38-
image: alpine:3.19
37+
- name: alpine-3.20
38+
image: alpine:3.20
3939
dockerfile: ../common/Dockerfile.j2
4040
privileged: true
4141
cgroupns_mode: host
4242
volumes:
4343
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4444
command: /sbin/init
45-
# - name: alpine-3.20
46-
# image: alpine:3.20
47-
# platform: x86_64
45+
# - name: alpine-3.21
46+
# image: alpine:3.21
4847
# dockerfile: ../common/Dockerfile.j2
4948
# privileged: true
5049
# cgroupns_mode: host

molecule/downgrade/molecule.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ platforms:
4242
volumes:
4343
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4444
command: /sbin/init
45+
- name: alpine-3.21
46+
image: alpine:3.21
47+
dockerfile: ../common/Dockerfile.j2
48+
privileged: true
49+
cgroupns_mode: host
50+
volumes:
51+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
52+
command: /sbin/init
4553
- name: amazonlinux-2
4654
image: amazonlinux:2
4755
platform: x86_64

molecule/plus/converge.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
- image-filter
2323
- lua
2424
- njs
25-
- opentracing
2625
- passenger
2726
- perl
2827
- prometheus

molecule/plus/molecule.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@ platforms:
1818
volumes:
1919
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2020
command: /usr/sbin/init
21-
- name: alpine-3.17
22-
image: alpine:3.17
23-
dockerfile: ../common/Dockerfile.j2
24-
privileged: true
25-
cgroupns_mode: host
26-
volumes:
27-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
28-
command: /sbin/init
2921
- name: alpine-3.18
3022
image: alpine:3.18
3123
dockerfile: ../common/Dockerfile.j2
@@ -50,6 +42,14 @@ platforms:
5042
volumes:
5143
- /sys/fs/cgroup:/sys/fs/cgroup:rw
5244
command: /sbin/init
45+
- name: alpine-3.21
46+
image: alpine:3.21
47+
dockerfile: ../common/Dockerfile.j2
48+
privileged: true
49+
cgroupns_mode: host
50+
volumes:
51+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
52+
command: /sbin/init
5353
- name: amazonlinux-2
5454
image: amazonlinux:2
5555
platform: x86_64

molecule/source-version/molecule.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@ platforms:
5050
volumes:
5151
- /sys/fs/cgroup:/sys/fs/cgroup:rw
5252
command: /sbin/init
53+
- name: alpine-3.21
54+
image: alpine:3.21
55+
dockerfile: ../common/Dockerfile.j2
56+
privileged: true
57+
cgroupns_mode: host
58+
volumes:
59+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
60+
command: /sbin/init
5361
- name: amazonlinux-2
5462
image: amazonlinux:2
5563
platform: x86_64

molecule/source/molecule.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ platforms:
4242
volumes:
4343
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4444
command: /sbin/init
45+
- name: alpine-3.21
46+
image: alpine:3.21
47+
dockerfile: ../common/Dockerfile.j2
48+
privileged: true
49+
cgroupns_mode: host
50+
volumes:
51+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
52+
command: /sbin/init
4553
- name: amazonlinux-2
4654
image: amazonlinux:2
4755
platform: x86_64

molecule/stable/molecule.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ platforms:
4242
volumes:
4343
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4444
command: /sbin/init
45+
- name: alpine-3.21
46+
image: alpine:3.21
47+
dockerfile: ../common/Dockerfile.j2
48+
privileged: true
49+
cgroupns_mode: host
50+
volumes:
51+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
52+
command: /sbin/init
4553
- name: amazonlinux-2
4654
image: amazonlinux:2
4755
platform: x86_64

0 commit comments

Comments
 (0)