diff --git a/packaging/ironbank/Dockerfile.tmpl b/packaging/ironbank/Dockerfile.tmpl index df0191144d9..16f9ae912f2 100644 --- a/packaging/ironbank/Dockerfile.tmpl +++ b/packaging/ironbank/Dockerfile.tmpl @@ -4,7 +4,7 @@ ################################################################################ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=redhat/ubi/ubi9 -ARG BASE_TAG=9.2 +ARG BASE_TAG=9.3 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS prep_files diff --git a/packaging/ironbank/hardening_manifest.yaml.tmpl b/packaging/ironbank/hardening_manifest.yaml.tmpl index 4c8f6fc2579..1848260a799 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/ubi9" +<<<<<<< HEAD:packaging/ironbank/hardening_manifest.yaml.tmpl BASE_TAG: "9.2" ELASTIC_STACK: "{{ beat_version }}" +======= + BASE_TAG: "9.3" + ELASTIC_STACK: "${APM_SERVER_VERSION}" +>>>>>>> f6a3cc03f (ironbank: use ubi:9.3 (#12077)):packaging/ironbank/hardening_manifest.yaml ELASTIC_PRODUCT: "apm-server" # Docker image labels