File tree Expand file tree Collapse file tree 11 files changed +40
-5
lines changed Expand file tree Collapse file tree 11 files changed +40
-5
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ name: Ansible Galaxy import
8
8
jobs :
9
9
galaxy :
10
10
name : Galaxy
11
- runs-on : ubuntu-20 .04
11
+ runs-on : ubuntu-22 .04
12
12
steps :
13
13
- name : Check out the codebase
14
14
uses : actions/checkout@v3
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ name: Molecule CI/CD
15
15
jobs :
16
16
molecule :
17
17
name : Molecule
18
- runs-on : ubuntu-20 .04
18
+ runs-on : ubuntu-22 .04
19
19
strategy :
20
20
fail-fast : false
21
21
matrix :
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ name: Release Drafter
13
13
jobs :
14
14
update_release_draft :
15
15
name : Update release draft
16
- runs-on : ubuntu-20 .04
16
+ runs-on : ubuntu-22 .04
17
17
steps :
18
18
- uses : release-drafter/release-drafter@v5
19
19
env :
Original file line number Diff line number Diff line change @@ -6,6 +6,10 @@ BUG FIXES:
6
6
7
7
The Alpine Linux ` libelf ` dependency is no longer automatically installed by NGINX App Protect DoS so we need to explicitly install it as a prerequisite.
8
8
9
+ TESTS:
10
+
11
+ Update GitHub actions to run on Ubuntu 22.04 (and thus support ` cgroups ` v2).
12
+
9
13
## 0.8.1 (September 28, 2022)
10
14
11
15
FEATURES:
Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ platforms:
20
20
image : centos:7
21
21
dockerfile : ../common/Dockerfile.j2
22
22
privileged : true
23
+ cgroupns_mode : host
23
24
volumes :
24
25
- /sys/fs/cgroup:/sys/fs/cgroup:rw
25
26
command : /usr/sbin/init
@@ -31,6 +32,7 @@ platforms:
31
32
image : debian:buster-slim
32
33
dockerfile : ../common/Dockerfile.j2
33
34
privileged : true
35
+ cgroupns_mode : host
34
36
volumes :
35
37
- /sys/fs/cgroup:/sys/fs/cgroup:rw
36
38
command : /sbin/init
@@ -42,6 +44,7 @@ platforms:
42
44
image : ubuntu:bionic
43
45
dockerfile : ../common/Dockerfile.j2
44
46
privileged : true
47
+ cgroupns_mode : host
45
48
volumes :
46
49
- /sys/fs/cgroup:/sys/fs/cgroup:rw
47
50
command : /sbin/init
@@ -53,6 +56,7 @@ platforms:
53
56
image : ubuntu:focal
54
57
dockerfile : ../common/Dockerfile.j2
55
58
privileged : true
59
+ cgroupns_mode : host
56
60
volumes :
57
61
- /sys/fs/cgroup:/sys/fs/cgroup:rw
58
62
command : /sbin/init
Original file line number Diff line number Diff line change @@ -26,11 +26,14 @@ RUN \
26
26
elif [ $(command -v yum) ]; then \
27
27
yum makecache fast \
28
28
&& yum install -y bash iproute initscripts sudo /usr/bin/python /usr/bin/python2-config vim yum-plugin-ovl \
29
+ && yum install -y http://mirror.centos.org/centos/7/os/x86_64/Packages/yum-plugin-copr-1.1.31-54.el7_8.noarch.rpm http://mirror.centos.org/centos/7/os/x86_64/Packages/libseccomp-2.3.1-4.el7.x86_64.rpm \
30
+ && yum copr enable -y jsynacek/systemd-backports-for-centos-7 \
31
+ && yum update --disableplugin=priorities -y systemd \
29
32
&& sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf \
30
33
&& yum clean all; \
31
34
elif [ $(command -v zypper) ]; then \
32
35
zypper refresh \
33
- && zypper install -y bash iproute2 python3 sudo vim \
36
+ && zypper install -y bash iproute2 python3 sudo systemd systemd-sysvinit vim \
34
37
&& zypper clean -a; \
35
38
elif [ $(command -v apk) ]; then \
36
39
apk update \
Original file line number Diff line number Diff line change 17
17
password : " {{ lookup('env', 'RHEL_PASSWORD') }}"
18
18
when :
19
19
- ansible_distribution == "RedHat"
20
- - rhel_subscription| bool
20
+ - rhel_subscription | bool
21
21
tasks :
22
22
- name : Install NGINX App Protect WAF
23
23
ansible.builtin.include_role :
Original file line number Diff line number Diff line change @@ -9,48 +9,55 @@ platforms:
9
9
image : amazonlinux:2
10
10
dockerfile : ../common/Dockerfile.j2
11
11
privileged : true
12
+ cgroupns_mode : host
12
13
volumes :
13
14
- /sys/fs/cgroup:/sys/fs/cgroup:rw
14
15
command : /usr/sbin/init
15
16
- name : centos-7
16
17
image : centos:7
17
18
dockerfile : ../common/Dockerfile.j2
18
19
privileged : true
20
+ cgroupns_mode : host
19
21
volumes :
20
22
- /sys/fs/cgroup:/sys/fs/cgroup:rw
21
23
command : /usr/sbin/init
22
24
- name : rhel-7
23
25
image : registry.access.redhat.com/ubi7/ubi:7.9
24
26
dockerfile : ../common/Dockerfile.j2
25
27
privileged : true
28
+ cgroupns_mode : host
26
29
volumes :
27
30
- /sys/fs/cgroup:/sys/fs/cgroup:rw
28
31
command : /usr/sbin/init
29
32
- name : rhel-8
30
33
image : registry.access.redhat.com/ubi8/ubi:8.5
31
34
dockerfile : ../common/Dockerfile.j2
32
35
privileged : true
36
+ cgroupns_mode : host
33
37
volumes :
34
38
- /sys/fs/cgroup:/sys/fs/cgroup:rw
35
39
command : /usr/sbin/init
36
40
- name : debian-buster
37
41
image : debian:buster-slim
38
42
dockerfile : ../common/Dockerfile.j2
39
43
privileged : true
44
+ cgroupns_mode : host
40
45
volumes :
41
46
- /sys/fs/cgroup:/sys/fs/cgroup:rw
42
47
command : /sbin/init
43
48
- name : ubuntu-bionic
44
49
image : ubuntu:bionic
45
50
dockerfile : ../common/Dockerfile.j2
46
51
privileged : true
52
+ cgroupns_mode : host
47
53
volumes :
48
54
- /sys/fs/cgroup:/sys/fs/cgroup:rw
49
55
command : /sbin/init
50
56
- name : ubuntu-focal
51
57
image : ubuntu:focal
52
58
dockerfile : ../common/Dockerfile.j2
53
59
privileged : true
60
+ cgroupns_mode : host
54
61
volumes :
55
62
- /sys/fs/cgroup:/sys/fs/cgroup:rw
56
63
command : /sbin/init
Original file line number Diff line number Diff line change @@ -9,55 +9,63 @@ platforms:
9
9
image : alpine:3.15
10
10
dockerfile : ../common/Dockerfile.j2
11
11
privileged : true
12
+ cgroupns_mode : host
12
13
volumes :
13
14
- /sys/fs/cgroup:/sys/fs/cgroup:rw
14
15
command : /sbin/init
15
16
- name : centos-7
16
17
image : centos:7
17
18
dockerfile : ../common/Dockerfile.j2
18
19
privileged : true
20
+ cgroupns_mode : host
19
21
volumes :
20
22
- /sys/fs/cgroup:/sys/fs/cgroup:rw
21
23
command : /usr/sbin/init
22
24
- name : rhel-7
23
25
image : registry.access.redhat.com/ubi7/ubi:7.9
24
26
dockerfile : ../common/Dockerfile.j2
25
27
privileged : true
28
+ cgroupns_mode : host
26
29
volumes :
27
30
- /sys/fs/cgroup:/sys/fs/cgroup:rw
28
31
command : /usr/sbin/init
29
32
- name : rhel-8
30
33
image : registry.access.redhat.com/ubi8/ubi:8.5
31
34
dockerfile : ../common/Dockerfile.j2
32
35
privileged : true
36
+ cgroupns_mode : host
33
37
volumes :
34
38
- /sys/fs/cgroup:/sys/fs/cgroup:rw
35
39
command : /usr/sbin/init
36
40
- name : debian-buster
37
41
image : debian:buster-slim
38
42
dockerfile : ../common/Dockerfile.j2
39
43
privileged : true
44
+ cgroupns_mode : host
40
45
volumes :
41
46
- /sys/fs/cgroup:/sys/fs/cgroup:rw
42
47
command : /sbin/init
43
48
- name : debian-bullseye
44
49
image : debian:bullseye-slim
45
50
dockerfile : ../common/Dockerfile.j2
46
51
privileged : true
52
+ cgroupns_mode : host
47
53
volumes :
48
54
- /sys/fs/cgroup:/sys/fs/cgroup:rw
49
55
command : /sbin/init
50
56
- name : ubuntu-bionic
51
57
image : ubuntu:bionic
52
58
dockerfile : ../common/Dockerfile.j2
53
59
privileged : true
60
+ cgroupns_mode : host
54
61
volumes :
55
62
- /sys/fs/cgroup:/sys/fs/cgroup:rw
56
63
command : /sbin/init
57
64
- name : ubuntu-focal
58
65
image : ubuntu:focal
59
66
dockerfile : ../common/Dockerfile.j2
60
67
privileged : true
68
+ cgroupns_mode : host
61
69
volumes :
62
70
- /sys/fs/cgroup:/sys/fs/cgroup:rw
63
71
command : /sbin/init
Original file line number Diff line number Diff line change @@ -9,34 +9,39 @@ platforms:
9
9
image : centos:7
10
10
dockerfile : ../common/Dockerfile.j2
11
11
privileged : true
12
+ cgroupns_mode : host
12
13
volumes :
13
14
- /sys/fs/cgroup:/sys/fs/cgroup:rw
14
15
command : /usr/sbin/init
15
16
- name : rhel-7
16
17
image : registry.access.redhat.com/ubi7/ubi:7.9
17
18
dockerfile : ../common/Dockerfile.j2
18
19
privileged : true
20
+ cgroupns_mode : host
19
21
volumes :
20
22
- /sys/fs/cgroup:/sys/fs/cgroup:rw
21
23
command : /usr/sbin/init
22
24
- name : debian-buster
23
25
image : debian:buster-slim
24
26
dockerfile : ../common/Dockerfile.j2
25
27
privileged : true
28
+ cgroupns_mode : host
26
29
volumes :
27
30
- /sys/fs/cgroup:/sys/fs/cgroup:rw
28
31
command : /sbin/init
29
32
- name : ubuntu-bionic
30
33
image : ubuntu:bionic
31
34
dockerfile : ../common/Dockerfile.j2
32
35
privileged : true
36
+ cgroupns_mode : host
33
37
volumes :
34
38
- /sys/fs/cgroup:/sys/fs/cgroup:rw
35
39
command : /sbin/init
36
40
- name : ubuntu-focal
37
41
image : ubuntu:focal
38
42
dockerfile : ../common/Dockerfile.j2
39
43
privileged : true
44
+ cgroupns_mode : host
40
45
volumes :
41
46
- /sys/fs/cgroup:/sys/fs/cgroup:rw
42
47
command : /sbin/init
You can’t perform that action at this time.
0 commit comments