Skip to content

Commit 75ab435

Browse files
authored
Update GitHub actions to use Ubuntu 22.04 (#229)
1 parent 854da6f commit 75ab435

File tree

11 files changed

+40
-5
lines changed

11 files changed

+40
-5
lines changed

.github/workflows/galaxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ name: Ansible Galaxy import
88
jobs:
99
galaxy:
1010
name: Galaxy
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- name: Check out the codebase
1414
uses: actions/checkout@v3

.github/workflows/molecule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ name: Molecule CI/CD
1515
jobs:
1616
molecule:
1717
name: Molecule
18-
runs-on: ubuntu-20.04
18+
runs-on: ubuntu-22.04
1919
strategy:
2020
fail-fast: false
2121
matrix:

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ name: Release Drafter
1313
jobs:
1414
update_release_draft:
1515
name: Update release draft
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-22.04
1717
steps:
1818
- uses: release-drafter/release-drafter@v5
1919
env:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ BUG FIXES:
66

77
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.
88

9+
TESTS:
10+
11+
Update GitHub actions to run on Ubuntu 22.04 (and thus support `cgroups` v2).
12+
913
## 0.8.1 (September 28, 2022)
1014

1115
FEATURES:

molecule/advanced/molecule.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ platforms:
2020
image: centos:7
2121
dockerfile: ../common/Dockerfile.j2
2222
privileged: true
23+
cgroupns_mode: host
2324
volumes:
2425
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2526
command: /usr/sbin/init
@@ -31,6 +32,7 @@ platforms:
3132
image: debian:buster-slim
3233
dockerfile: ../common/Dockerfile.j2
3334
privileged: true
35+
cgroupns_mode: host
3436
volumes:
3537
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3638
command: /sbin/init
@@ -42,6 +44,7 @@ platforms:
4244
image: ubuntu:bionic
4345
dockerfile: ../common/Dockerfile.j2
4446
privileged: true
47+
cgroupns_mode: host
4548
volumes:
4649
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4750
command: /sbin/init
@@ -53,6 +56,7 @@ platforms:
5356
image: ubuntu:focal
5457
dockerfile: ../common/Dockerfile.j2
5558
privileged: true
59+
cgroupns_mode: host
5660
volumes:
5761
- /sys/fs/cgroup:/sys/fs/cgroup:rw
5862
command: /sbin/init

molecule/common/Dockerfile.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@ RUN \
2626
elif [ $(command -v yum) ]; then \
2727
yum makecache fast \
2828
&& 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 \
2932
&& sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf \
3033
&& yum clean all; \
3134
elif [ $(command -v zypper) ]; then \
3235
zypper refresh \
33-
&& zypper install -y bash iproute2 python3 sudo vim \
36+
&& zypper install -y bash iproute2 python3 sudo systemd systemd-sysvinit vim \
3437
&& zypper clean -a; \
3538
elif [ $(command -v apk) ]; then \
3639
apk update \

molecule/default/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
password: "{{ lookup('env', 'RHEL_PASSWORD') }}"
1818
when:
1919
- ansible_distribution == "RedHat"
20-
- rhel_subscription| bool
20+
- rhel_subscription | bool
2121
tasks:
2222
- name: Install NGINX App Protect WAF
2323
ansible.builtin.include_role:

molecule/default/molecule.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,48 +9,55 @@ platforms:
99
image: amazonlinux:2
1010
dockerfile: ../common/Dockerfile.j2
1111
privileged: true
12+
cgroupns_mode: host
1213
volumes:
1314
- /sys/fs/cgroup:/sys/fs/cgroup:rw
1415
command: /usr/sbin/init
1516
- name: centos-7
1617
image: centos:7
1718
dockerfile: ../common/Dockerfile.j2
1819
privileged: true
20+
cgroupns_mode: host
1921
volumes:
2022
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2123
command: /usr/sbin/init
2224
- name: rhel-7
2325
image: registry.access.redhat.com/ubi7/ubi:7.9
2426
dockerfile: ../common/Dockerfile.j2
2527
privileged: true
28+
cgroupns_mode: host
2629
volumes:
2730
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2831
command: /usr/sbin/init
2932
- name: rhel-8
3033
image: registry.access.redhat.com/ubi8/ubi:8.5
3134
dockerfile: ../common/Dockerfile.j2
3235
privileged: true
36+
cgroupns_mode: host
3337
volumes:
3438
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3539
command: /usr/sbin/init
3640
- name: debian-buster
3741
image: debian:buster-slim
3842
dockerfile: ../common/Dockerfile.j2
3943
privileged: true
44+
cgroupns_mode: host
4045
volumes:
4146
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4247
command: /sbin/init
4348
- name: ubuntu-bionic
4449
image: ubuntu:bionic
4550
dockerfile: ../common/Dockerfile.j2
4651
privileged: true
52+
cgroupns_mode: host
4753
volumes:
4854
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4955
command: /sbin/init
5056
- name: ubuntu-focal
5157
image: ubuntu:focal
5258
dockerfile: ../common/Dockerfile.j2
5359
privileged: true
60+
cgroupns_mode: host
5461
volumes:
5562
- /sys/fs/cgroup:/sys/fs/cgroup:rw
5663
command: /sbin/init

molecule/dos/molecule.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,55 +9,63 @@ platforms:
99
image: alpine:3.15
1010
dockerfile: ../common/Dockerfile.j2
1111
privileged: true
12+
cgroupns_mode: host
1213
volumes:
1314
- /sys/fs/cgroup:/sys/fs/cgroup:rw
1415
command: /sbin/init
1516
- name: centos-7
1617
image: centos:7
1718
dockerfile: ../common/Dockerfile.j2
1819
privileged: true
20+
cgroupns_mode: host
1921
volumes:
2022
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2123
command: /usr/sbin/init
2224
- name: rhel-7
2325
image: registry.access.redhat.com/ubi7/ubi:7.9
2426
dockerfile: ../common/Dockerfile.j2
2527
privileged: true
28+
cgroupns_mode: host
2629
volumes:
2730
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2831
command: /usr/sbin/init
2932
- name: rhel-8
3033
image: registry.access.redhat.com/ubi8/ubi:8.5
3134
dockerfile: ../common/Dockerfile.j2
3235
privileged: true
36+
cgroupns_mode: host
3337
volumes:
3438
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3539
command: /usr/sbin/init
3640
- name: debian-buster
3741
image: debian:buster-slim
3842
dockerfile: ../common/Dockerfile.j2
3943
privileged: true
44+
cgroupns_mode: host
4045
volumes:
4146
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4247
command: /sbin/init
4348
- name: debian-bullseye
4449
image: debian:bullseye-slim
4550
dockerfile: ../common/Dockerfile.j2
4651
privileged: true
52+
cgroupns_mode: host
4753
volumes:
4854
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4955
command: /sbin/init
5056
- name: ubuntu-bionic
5157
image: ubuntu:bionic
5258
dockerfile: ../common/Dockerfile.j2
5359
privileged: true
60+
cgroupns_mode: host
5461
volumes:
5562
- /sys/fs/cgroup:/sys/fs/cgroup:rw
5663
command: /sbin/init
5764
- name: ubuntu-focal
5865
image: ubuntu:focal
5966
dockerfile: ../common/Dockerfile.j2
6067
privileged: true
68+
cgroupns_mode: host
6169
volumes:
6270
- /sys/fs/cgroup:/sys/fs/cgroup:rw
6371
command: /sbin/init

molecule/specific-version/molecule.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,39 @@ platforms:
99
image: centos:7
1010
dockerfile: ../common/Dockerfile.j2
1111
privileged: true
12+
cgroupns_mode: host
1213
volumes:
1314
- /sys/fs/cgroup:/sys/fs/cgroup:rw
1415
command: /usr/sbin/init
1516
- name: rhel-7
1617
image: registry.access.redhat.com/ubi7/ubi:7.9
1718
dockerfile: ../common/Dockerfile.j2
1819
privileged: true
20+
cgroupns_mode: host
1921
volumes:
2022
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2123
command: /usr/sbin/init
2224
- name: debian-buster
2325
image: debian:buster-slim
2426
dockerfile: ../common/Dockerfile.j2
2527
privileged: true
28+
cgroupns_mode: host
2629
volumes:
2730
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2831
command: /sbin/init
2932
- name: ubuntu-bionic
3033
image: ubuntu:bionic
3134
dockerfile: ../common/Dockerfile.j2
3235
privileged: true
36+
cgroupns_mode: host
3337
volumes:
3438
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3539
command: /sbin/init
3640
- name: ubuntu-focal
3741
image: ubuntu:focal
3842
dockerfile: ../common/Dockerfile.j2
3943
privileged: true
44+
cgroupns_mode: host
4045
volumes:
4146
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4247
command: /sbin/init

0 commit comments

Comments
 (0)