From 7001e066b6036aa1b1c0d5afe594dd410abca55e Mon Sep 17 00:00:00 2001 From: Julien Lind Date: Mon, 9 Oct 2023 15:19:08 +0200 Subject: [PATCH] change base image to ubi 9.2 (#36797) Co-authored-by: julienlind (cherry picked from commit 239357688ce0c5172c2dcca54a472809868b2646) # Conflicts: # dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile # dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml # dev-tools/packaging/templates/ironbank/filebeat/Dockerfile # dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml # dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile # dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml # dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile # dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml # dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile # dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml --- dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile | 4 ++++ .../templates/ironbank/auditbeat/hardening_manifest.yaml | 4 ++++ dev-tools/packaging/templates/ironbank/filebeat/Dockerfile | 4 ++++ .../templates/ironbank/filebeat/hardening_manifest.yaml | 4 ++++ dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile | 4 ++++ .../templates/ironbank/heartbeat/hardening_manifest.yaml | 4 ++++ dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile | 4 ++++ .../templates/ironbank/metricbeat/hardening_manifest.yaml | 4 ++++ dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile | 4 ++++ .../templates/ironbank/packetbeat/hardening_manifest.yaml | 4 ++++ 10 files changed, 40 insertions(+) diff --git a/dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile b/dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile index 85285953870..d05e57033f3 100644 --- a/dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile +++ b/dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile @@ -4,7 +4,11 @@ ################################################################################ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 +<<<<<<< HEAD ARG BASE_TAG=8.7 +======= +ARG BASE_TAG=9.2 +>>>>>>> 239357688c (change base image to ubi 9.2 (#36797)) FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder diff --git a/dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml index a9129926689..ffcb8729d88 100644 --- a/dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml +++ b/dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml @@ -13,7 +13,11 @@ tags: # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "redhat/ubi/ubi8" +<<<<<<< HEAD BASE_TAG: "8.7" +======= + BASE_TAG: "9.2" +>>>>>>> 239357688c (change base image to ubi 9.2 (#36797)) ELASTIC_STACK: "{{ beat_version }}" ELASTIC_PRODUCT: "auditbeat" diff --git a/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile b/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile index 9b34c1f459e..3280897d6d4 100644 --- a/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile +++ b/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile @@ -4,7 +4,11 @@ ################################################################################ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 +<<<<<<< HEAD ARG BASE_TAG=8.7 +======= +ARG BASE_TAG=9.2 +>>>>>>> 239357688c (change base image to ubi 9.2 (#36797)) FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder diff --git a/dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml index e43033475f3..89e2e141709 100644 --- a/dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml +++ b/dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml @@ -13,7 +13,11 @@ tags: # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "redhat/ubi/ubi8" +<<<<<<< HEAD BASE_TAG: "8.7" +======= + BASE_TAG: "9.2" +>>>>>>> 239357688c (change base image to ubi 9.2 (#36797)) ELASTIC_STACK: "{{ beat_version }}" ELASTIC_PRODUCT: "filebeat" diff --git a/dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile b/dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile index 209756ca1d4..daa51e12156 100644 --- a/dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile +++ b/dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile @@ -4,7 +4,11 @@ ################################################################################ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 +<<<<<<< HEAD ARG BASE_TAG=8.7 +======= +ARG BASE_TAG=9.2 +>>>>>>> 239357688c (change base image to ubi 9.2 (#36797)) FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files diff --git a/dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml index 6033ad214dc..8296d9114a8 100644 --- a/dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml +++ b/dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml @@ -13,7 +13,11 @@ tags: # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "redhat/ubi/ubi8" +<<<<<<< HEAD BASE_TAG: "8.7" +======= + BASE_TAG: "9.2" +>>>>>>> 239357688c (change base image to ubi 9.2 (#36797)) ELASTIC_STACK: "{{ beat_version }}" ELASTIC_PRODUCT: "heartbeat" diff --git a/dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile b/dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile index ee78b132a75..752765a8fe4 100644 --- a/dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile +++ b/dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile @@ -4,7 +4,11 @@ ################################################################################ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 +<<<<<<< HEAD ARG BASE_TAG=8.7 +======= +ARG BASE_TAG=9.2 +>>>>>>> 239357688c (change base image to ubi 9.2 (#36797)) FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder diff --git a/dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml index 13e03d8d70f..f1d1040b484 100644 --- a/dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml +++ b/dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml @@ -13,7 +13,11 @@ tags: # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "redhat/ubi/ubi8" +<<<<<<< HEAD BASE_TAG: "8.7" +======= + BASE_TAG: "9.2" +>>>>>>> 239357688c (change base image to ubi 9.2 (#36797)) ELASTIC_STACK: "{{ beat_version }}" ELASTIC_PRODUCT: "metricbeat" diff --git a/dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile b/dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile index 9a53d776459..6cc209e17df 100644 --- a/dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile +++ b/dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile @@ -4,7 +4,11 @@ ################################################################################ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 +<<<<<<< HEAD ARG BASE_TAG=8.7 +======= +ARG BASE_TAG=9.2 +>>>>>>> 239357688c (change base image to ubi 9.2 (#36797)) FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder diff --git a/dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml index c8335efb17b..8d519b8f835 100644 --- a/dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml +++ b/dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml @@ -13,7 +13,11 @@ tags: # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "redhat/ubi/ubi8" +<<<<<<< HEAD BASE_TAG: "8.7" +======= + BASE_TAG: "9.2" +>>>>>>> 239357688c (change base image to ubi 9.2 (#36797)) ELASTIC_STACK: "{{ beat_version }}" ELASTIC_PRODUCT: "packetbeat"