ironbank: use ubi:9.3 (#12077)

(cherry picked from commit f6a3cc0) # Conflicts: # packaging/ironbank/hardening_manifest.yaml.tmpl
elastic · Nov 21, 2023 · 7dc2658 · 7dc2658
1 parent 83b562f
commit 7dc2658
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packaging/ironbank/Dockerfile.tmpl b/packaging/ironbank/Dockerfile.tmpl
@@ -4,7 +4,7 @@
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=redhat/ubi/ubi9
-ARG BASE_TAG=9.2
+ARG BASE_TAG=9.3
 
 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
@@ -13,8 +13,13 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "redhat/ubi/ubi9"
+<<<<<<< HEAD:packaging/ironbank/hardening_manifest.yaml.tmpl
   BASE_TAG: "9.2"
   ELASTIC_STACK: "{{ beat_version }}"
+=======
+  BASE_TAG: "9.3"
+  ELASTIC_STACK: "${APM_SERVER_VERSION}"
+>>>>>>> f6a3cc03f (ironbank: use ubi:9.3 (#12077)):packaging/ironbank/hardening_manifest.yaml
   ELASTIC_PRODUCT: "apm-server"
 
 # Docker image labels