ironbank: bump version to 8.8 (#11780)

(cherry picked from commit 96f10a5) # Conflicts: # packaging/ironbank/Dockerfile.tmpl
elastic · Oct 6, 2023 · 0792893 · 0792893
1 parent db67200
commit 0792893
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/packaging/ironbank/Dockerfile.tmpl b/packaging/ironbank/Dockerfile.tmpl
@@ -4,7 +4,11 @@
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
+<<<<<<< HEAD:packaging/ironbank/Dockerfile.tmpl
 ARG BASE_TAG=8.6
+=======
+ARG BASE_TAG=8.8
+>>>>>>> 96f10a575 (ironbank: bump version to 8.8 (#11780)):packaging/ironbank/Dockerfile
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS prep_files