Skip to content

Commit 22c901b

Browse files
deps: Bump ironbank version to 9.7 (#19558)
* 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 <[email protected]> (cherry picked from commit 154b806) # Conflicts: # packaging/ironbank/hardening_manifest.yaml
1 parent 5139a9a commit 22c901b

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

packaging/ironbank/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
################################################################################
55
ARG BASE_REGISTRY=registry1.dsop.io
66
ARG BASE_IMAGE=redhat/ubi/ubi9
7-
ARG BASE_TAG=9.6
7+
ARG BASE_TAG=9.7
88

99
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS prep_files
1010

packaging/ironbank/hardening_manifest.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,13 @@ tags:
1313
# Build args passed to Dockerfile ARGs
1414
args:
1515
BASE_IMAGE: "redhat/ubi/ubi9"
16+
<<<<<<< HEAD
1617
BASE_TAG: "9.6"
1718
ELASTIC_STACK: "{{ beat_version }}"
19+
=======
20+
BASE_TAG: "9.7"
21+
ELASTIC_STACK: "${APM_SERVER_VERSION}"
22+
>>>>>>> 154b8060 (deps: Bump ironbank version to 9.7 (#19558))
1823
ELASTIC_PRODUCT: "apm-server"
1924

2025
# Docker image labels

0 commit comments

Comments
 (0)