From 14c1c9575b9e4a29df0cce28d63dc4960b99bc42 Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Wed, 18 Dec 2024 12:29:50 -0500 Subject: [PATCH] Backport of Update UBI Image into release/1.20.x (#22012) * backport of commit 48ce915c47aa90e29aa927e87a13662908a9a98a * backport of commit 83de2ede0798ff99c17f3ccef4865bd3be0a19e4 --------- Co-authored-by: Sarah Alsmiller --- .changelog/22011.txt | 4 ++++ Dockerfile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .changelog/22011.txt diff --git a/.changelog/22011.txt b/.changelog/22011.txt new file mode 100644 index 000000000000..572eb2f42bd8 --- /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). +``` + diff --git a/Dockerfile b/Dockerfile index e520db57ad58..0440878788ff 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