From 07297bbe3705e77510f6fa714dab8a20f31f1499 Mon Sep 17 00:00:00 2001 From: Sarah Alsmiller Date: Tue, 17 Dec 2024 20:39:26 +0000 Subject: [PATCH 1/2] backport of commit 48ce915c47aa90e29aa927e87a13662908a9a98a --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e520db57ad5..0440878788f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -203,7 +203,7 @@ CMD ["agent", "-dev", "-client", "0.0.0.0"] # Red Hat UBI-based image # This target is used to build a Consul image for use on OpenShift. -FROM registry.access.redhat.com/ubi9-minimal:9.4 as ubi +FROM registry.access.redhat.com/ubi9-minimal:9.5 as ubi ARG PRODUCT_VERSION ARG PRODUCT_REVISION From b4237c64e0e05a7030559b6185f2aed8b31eb9db Mon Sep 17 00:00:00 2001 From: Sarah Alsmiller Date: Tue, 17 Dec 2024 20:46:44 +0000 Subject: [PATCH 2/2] backport of commit 83de2ede0798ff99c17f3ccef4865bd3be0a19e4 --- .changelog/22011.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .changelog/22011.txt diff --git a/.changelog/22011.txt b/.changelog/22011.txt new file mode 100644 index 00000000000..572eb2f42bd --- /dev/null +++ b/.changelog/22011.txt @@ -0,0 +1,4 @@ +```release-note:security +Update `registry.access.redhat.com/ubi9-minimal` image to 9.5 to address [CVE-2019-12900](https://nvd.nist.gov/vuln/detail/cve-2019-12900),[CVE-2024-3596](https://nvd.nist.gov/vuln/detail/CVE-2024-3596),[CVE-2024-2511](https://nvd.nist.gov/vuln/detail/CVE-2024-2511),[CVE-2024-26458](https://nvd.nist.gov/vuln/detail/CVE-2024-26458),[CVE-2024-4067](https://nvd.nist.gov/vuln/detail/CVE-2024-4067). +``` +