Update Dockerfile

elastic · Oct 9, 2023 · d1a243c · d1a243c
1 parent 3a8e1cc
commit d1a243c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile b/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile
@@ -4,11 +4,7 @@
 ################################################################################
 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