From ba160be22e7b56afb344e09fa750f80ca92ed1c1 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Fri, 6 Oct 2023 15:32:23 +0200 Subject: [PATCH] ironbank: update hardening to 8.8 (#11788) (cherry picked from commit 0e174d100be1e5d70d6fe95d6d405e2302ff06f3) # Conflicts: # packaging/ironbank/hardening_manifest.yaml.tmpl --- packaging/ironbank/hardening_manifest.yaml.tmpl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packaging/ironbank/hardening_manifest.yaml.tmpl b/packaging/ironbank/hardening_manifest.yaml.tmpl index 820f49837f2..5afbefb081e 100644 --- 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