Merge branch 'main' into nicoleta-NET-9589

hashicorp · Sep 17, 2024 · 974f90c · 974f90c
2 parents 61a85b0 + fe820d5
commit 974f90c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.changelog/21750.txt b/.changelog/21750.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+security: upgrade ubi base image to 9.4
+```
diff --git a/.release/versions.hcl b/.release/versions.hcl
@@ -8,7 +8,7 @@ schema = 1
 active_versions {
   version "1.20" {
     ce_active = true
-  },
+  }
   version "1.19" {
     ce_active = true
   }

diff --git 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.3 as ubi
+FROM registry.access.redhat.com/ubi9-minimal:9.4 as ubi
 
 ARG PRODUCT_VERSION
 ARG PRODUCT_REVISION