diff --git a/CHANGELOG.md b/CHANGELOG.md index 57c0dc504..891f7139b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,10 @@ DOCUMENTATION: - Update community docs per the latest [NGINX template repository](https://github.com/nginxinc/template-repository) guidelines. - Update and tweak the README. In order to make the installation instructions easier, some file names used by the various GitHub Actions workflows have been renamed. +TESTS: + +- Update RHEL UBI images to UBI 8.10 and UBI 9.4. + CI/CD: - Update GitHub Actions to Ubuntu 24.04. diff --git a/molecule/agent/molecule.yml b/molecule/agent/molecule.yml index 2adbf4b1a..8a1471e80 100644 --- a/molecule/agent/molecule.yml +++ b/molecule/agent/molecule.yml @@ -100,7 +100,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.9 + image: redhat/ubi8:8.10 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -108,7 +108,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/amplify/molecule.yml b/molecule/amplify/molecule.yml index 947c389fa..66e43cbd5 100644 --- a/molecule/amplify/molecule.yml +++ b/molecule/amplify/molecule.yml @@ -28,7 +28,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 3df98f218..330e273f4 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -100,7 +100,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.9 + image: redhat/ubi8:8.10 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -108,7 +108,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/distribution/molecule.yml b/molecule/distribution/molecule.yml index 3df98f218..330e273f4 100644 --- a/molecule/distribution/molecule.yml +++ b/molecule/distribution/molecule.yml @@ -100,7 +100,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.9 + image: redhat/ubi8:8.10 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -108,7 +108,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/downgrade-plus/molecule.yml b/molecule/downgrade-plus/molecule.yml index c242f58a4..9f014a2cb 100644 --- a/molecule/downgrade-plus/molecule.yml +++ b/molecule/downgrade-plus/molecule.yml @@ -101,7 +101,7 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.9 + image: redhat/ubi8:8.10 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -109,7 +109,7 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/downgrade/molecule.yml b/molecule/downgrade/molecule.yml index 0977799db..72225d3e6 100644 --- a/molecule/downgrade/molecule.yml +++ b/molecule/downgrade/molecule.yml @@ -100,7 +100,7 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.9 + image: redhat/ubi8:8.10 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -108,7 +108,7 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/plus/molecule.yml b/molecule/plus/molecule.yml index b1ff6072d..7121ce5cd 100644 --- a/molecule/plus/molecule.yml +++ b/molecule/plus/molecule.yml @@ -101,7 +101,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.9 + image: redhat/ubi8:8.10 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -109,7 +109,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/source-version/molecule.yml b/molecule/source-version/molecule.yml index 22adec169..f7c0358dc 100644 --- a/molecule/source-version/molecule.yml +++ b/molecule/source-version/molecule.yml @@ -100,7 +100,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.9 + image: redhat/ubi8:8.10 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -108,7 +108,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/source/molecule.yml b/molecule/source/molecule.yml index 3df98f218..330e273f4 100644 --- a/molecule/source/molecule.yml +++ b/molecule/source/molecule.yml @@ -100,7 +100,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.9 + image: redhat/ubi8:8.10 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -108,7 +108,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/stable/molecule.yml b/molecule/stable/molecule.yml index 3df98f218..330e273f4 100644 --- a/molecule/stable/molecule.yml +++ b/molecule/stable/molecule.yml @@ -100,7 +100,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.9 + image: redhat/ubi8:8.10 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -108,7 +108,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/uninstall-plus/molecule.yml b/molecule/uninstall-plus/molecule.yml index b1ff6072d..7121ce5cd 100644 --- a/molecule/uninstall-plus/molecule.yml +++ b/molecule/uninstall-plus/molecule.yml @@ -101,7 +101,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.9 + image: redhat/ubi8:8.10 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -109,7 +109,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/uninstall/molecule.yml b/molecule/uninstall/molecule.yml index d41740c06..a6141963d 100644 --- a/molecule/uninstall/molecule.yml +++ b/molecule/uninstall/molecule.yml @@ -100,7 +100,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.9 + image: redhat/ubi8:8.10 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -108,7 +108,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/upgrade-plus/molecule.yml b/molecule/upgrade-plus/molecule.yml index b31d080f1..9094c75a6 100644 --- a/molecule/upgrade-plus/molecule.yml +++ b/molecule/upgrade-plus/molecule.yml @@ -101,7 +101,7 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.9 + image: redhat/ubi8:8.10 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -109,7 +109,7 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/upgrade/molecule.yml b/molecule/upgrade/molecule.yml index 8519a9226..8c55ddb8d 100644 --- a/molecule/upgrade/molecule.yml +++ b/molecule/upgrade/molecule.yml @@ -100,7 +100,7 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.9 + image: redhat/ubi8:8.10 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -108,7 +108,7 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/version/molecule.yml b/molecule/version/molecule.yml index 22adec169..f7c0358dc 100644 --- a/molecule/version/molecule.yml +++ b/molecule/version/molecule.yml @@ -100,7 +100,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-8 - image: redhat/ubi8:8.9 + image: redhat/ubi8:8.10 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -108,7 +108,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-9 - image: redhat/ubi9:9.3 + image: redhat/ubi9:9.4 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host