From 22c901badbe2a7b5122047225396282fd06f0bed Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Thu, 13 Nov 2025 11:35:50 +0100 Subject: [PATCH 1/2] deps: Bump ironbank version to 9.7 (#19558) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: deps(ironbank): Bump ubi version to 9.7 Made with ❤️️ by updatecli * chore: deps(ironbank): Bump ubi version to 9.7 Made with ❤️️ by updatecli * Apply suggestions from code review --------- Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Co-authored-by: Victor Martinez (cherry picked from commit 154b8060434257c5fe83ba2fd24dc92a366a113c) # Conflicts: # packaging/ironbank/hardening_manifest.yaml --- packaging/ironbank/Dockerfile | 2 +- packaging/ironbank/hardening_manifest.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packaging/ironbank/Dockerfile b/packaging/ironbank/Dockerfile index 48357d05d22..85a52100ec0 100644 --- a/packaging/ironbank/Dockerfile +++ b/packaging/ironbank/Dockerfile @@ -4,7 +4,7 @@ ################################################################################ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=redhat/ubi/ubi9 -ARG BASE_TAG=9.6 +ARG BASE_TAG=9.7 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS prep_files diff --git a/packaging/ironbank/hardening_manifest.yaml b/packaging/ironbank/hardening_manifest.yaml index 262a296a43e..28758319cd4 100644 --- a/packaging/ironbank/hardening_manifest.yaml +++ b/packaging/ironbank/hardening_manifest.yaml @@ -13,8 +13,13 @@ tags: # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "redhat/ubi/ubi9" +<<<<<<< HEAD BASE_TAG: "9.6" ELASTIC_STACK: "{{ beat_version }}" +======= + BASE_TAG: "9.7" + ELASTIC_STACK: "${APM_SERVER_VERSION}" +>>>>>>> 154b8060 (deps: Bump ironbank version to 9.7 (#19558)) ELASTIC_PRODUCT: "apm-server" # Docker image labels From 5a0653e666f7b41f32ef7b6bc33acbc233115d07 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Mon, 24 Nov 2025 11:13:49 +0100 Subject: [PATCH 2/2] Update hardening_manifest.yaml --- packaging/ironbank/hardening_manifest.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packaging/ironbank/hardening_manifest.yaml b/packaging/ironbank/hardening_manifest.yaml index 28758319cd4..960a905294a 100644 --- a/packaging/ironbank/hardening_manifest.yaml +++ b/packaging/ironbank/hardening_manifest.yaml @@ -13,13 +13,8 @@ tags: # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "redhat/ubi/ubi9" -<<<<<<< HEAD - BASE_TAG: "9.6" - ELASTIC_STACK: "{{ beat_version }}" -======= BASE_TAG: "9.7" - ELASTIC_STACK: "${APM_SERVER_VERSION}" ->>>>>>> 154b8060 (deps: Bump ironbank version to 9.7 (#19558)) + ELASTIC_STACK: "{{ beat_version }}" ELASTIC_PRODUCT: "apm-server" # Docker image labels