From 506059a0ac3af5907aa744fbd2805e5e77d193a4 Mon Sep 17 00:00:00 2001
From: Sam Doran <sdoran@redhat.com>
Date: Fri, 26 Apr 2024 14:45:26 -0400
Subject: [PATCH] Use multi-arch container images for development (#5045)

Instead of pulling different images from different registries and maintaining
a separate Docker Compose file, use images that contain both architectures.
---
 Makefile               |  4 ----
 docker-compose.arm.yml | 10 ----------
 docker-compose.yml     |  4 ++--
 3 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 docker-compose.arm.yml

diff --git a/Makefile b/Makefile
index abf2af5b5c..76ce5d44c9 100644
--- a/Makefile
+++ b/Makefile
@@ -29,11 +29,7 @@ ifneq ($(DOCKER_COMPOSE_CHECK), 0)
 	DOCKER_COMPOSE_BIN = $(DOCKER)-compose
 endif
 
-# Use ARM images on ARM systems
 DOCKER_COMPOSE = $(DOCKER_COMPOSE_BIN)
-ifeq (arm, $(findstring arm, $(shell uname -m)))
-	DOCKER_COMPOSE = $(DOCKER_COMPOSE_BIN) -f docker-compose.yml -f docker-compose.arm.yml
-endif
 
 # Testing directories
 TESTINGDIR = $(TOPDIR)/testing
diff --git a/docker-compose.arm.yml b/docker-compose.arm.yml
deleted file mode 100644
index 4b98207136..0000000000
--- a/docker-compose.arm.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# The Makefile will automatically use this file on ARM systems
-
-version: '3'
-
-services:
-  hive-metastore:
-    image: quay.io/mskarbek/ubi-hive:3.1.3-metastore-024
-
-  trino:
-    image: quay.io/mskarbek/ubi-trino:443-002
diff --git a/docker-compose.yml b/docker-compose.yml
index 6d0242bfc3..90924f967c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -614,7 +614,7 @@ services:
 
   hive-metastore:
     container_name: hive-metastore
-    image: quay.io/cloudservices/ubi-hive:3.1.3-metastore-024
+    image: quay.io/samdoran/ubi-hive:3.1.3-metastore-036
     ports:
       - 9083:8000
     environment:
@@ -637,7 +637,7 @@ services:
 
   trino:
     container_name: trino
-    image: quay.io/cloudservices/ubi-trino:443-002
+    image: quay.io/samdoran/ubi-trino:443-002
     user: root
     ports:
       - 8080:8080