From bd72f063f17943ceac49519a8f30feb2199bbf60 Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Tue, 10 Oct 2023 16:41:04 +0200
Subject: [PATCH] ironbank: ubi9:9.2 (#11785)

(cherry picked from commit 3f140768c7e6ac5211a49bd636b6725874663c76)

# Conflicts:
#	packaging/ironbank/hardening_manifest.yaml.tmpl
---
 packaging/ironbank/Dockerfile.tmpl              | 4 ++--
 packaging/ironbank/hardening_manifest.yaml.tmpl | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packaging/ironbank/Dockerfile.tmpl b/packaging/ironbank/Dockerfile.tmpl
index d432230c393..37e5dbe54c3 100644
--- a/packaging/ironbank/Dockerfile.tmpl
+++ b/packaging/ironbank/Dockerfile.tmpl
@@ -3,8 +3,8 @@
 # Extract APM Server and make various file manipulations.
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
-ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
-ARG BASE_TAG=8.8
+ARG BASE_IMAGE=ironbank/redhat/ubi/ubi9
+ARG BASE_TAG=9.2
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS prep_files
 
diff --git a/packaging/ironbank/hardening_manifest.yaml.tmpl b/packaging/ironbank/hardening_manifest.yaml.tmpl
index 36b6fa256a9..3cd9d3d6b98 100644
--- a/packaging/ironbank/hardening_manifest.yaml.tmpl
+++ b/packaging/ironbank/hardening_manifest.yaml.tmpl
@@ -12,9 +12,15 @@ tags:
 
 # Build args passed to Dockerfile ARGs
 args:
+<<<<<<< HEAD:packaging/ironbank/hardening_manifest.yaml.tmpl
   BASE_IMAGE: "redhat/ubi/ubi8"
   BASE_TAG: "8.8"
   ELASTIC_STACK: "{{ beat_version }}"
+=======
+  BASE_IMAGE: "ironbank/redhat/ubi/ubi9"
+  BASE_TAG: "9.2"
+  ELASTIC_STACK: "${APM_SERVER_VERSION}"
+>>>>>>> 3f140768c (ironbank: ubi9:9.2 (#11785)):packaging/ironbank/hardening_manifest.yaml
   ELASTIC_PRODUCT: "apm-server"
 
 # Docker image labels