Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packaging/ironbank/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions packaging/ironbank/hardening_manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading