ironbank: update hardening to 8.8 (#11788)

(cherry picked from commit 0e174d1) # Conflicts: # packaging/ironbank/hardening_manifest.yaml.tmpl
elastic · Oct 6, 2023 · ba160be · ba160be
1 parent db67200
commit ba160be
Showing 1 changed file with 5 additions and 0 deletions.
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/ubi8"
+<<<<<<< HEAD:packaging/ironbank/hardening_manifest.yaml.tmpl
   BASE_TAG: "8.6"
   ELASTIC_STACK: "{{ beat_version }}"
+=======
+  BASE_TAG: "8.8"
+  ELASTIC_STACK: "${APM_SERVER_VERSION}"
+>>>>>>> 0e174d100 (ironbank: update hardening to 8.8 (#11788)):packaging/ironbank/hardening_manifest.yaml
   ELASTIC_PRODUCT: "apm-server"
 
 # Docker image labels