change base image to ubi 9.2 (#36797)

Co-authored-by: julienlind <[email protected]> (cherry picked from commit 2393576) # 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
elastic · Oct 9, 2023 · 7001e06 · 7001e06
1 parent aae1fa2
commit 7001e06
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"