From 6237edc354f6534bf1827db99f756f3cb1b3f7bd Mon Sep 17 00:00:00 2001
From: Dipesh Rawat <Dipesh.rawat@ibm.com>
Date: Sun, 22 Jan 2023 17:15:45 +0000
Subject: [PATCH] =?UTF-8?q?Issue=C2=A0#564=C2=A0:=20Add=20a=20common=20hel?=
 =?UTF-8?q?loMMS=20Converge=20Dockerfile=20for=20all=20ARCH?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Dipesh Rawat <Dipesh.rawat@ibm.com>
---
 edge/services/helloMMS/{Dockerfile.amd64 => Dockerfile} | 0
 edge/services/helloMMS/Dockerfile.arm                   | 8 --------
 edge/services/helloMMS/Dockerfile.arm64                 | 8 --------
 edge/services/helloMMS/Makefile                         | 2 +-
 4 files changed, 1 insertion(+), 17 deletions(-)
 rename edge/services/helloMMS/{Dockerfile.amd64 => Dockerfile} (100%)
 delete mode 100644 edge/services/helloMMS/Dockerfile.arm
 delete mode 100644 edge/services/helloMMS/Dockerfile.arm64

diff --git a/edge/services/helloMMS/Dockerfile.amd64 b/edge/services/helloMMS/Dockerfile
similarity index 100%
rename from edge/services/helloMMS/Dockerfile.amd64
rename to edge/services/helloMMS/Dockerfile
diff --git a/edge/services/helloMMS/Dockerfile.arm b/edge/services/helloMMS/Dockerfile.arm
deleted file mode 100644
index 8c4b0f4e..00000000
--- a/edge/services/helloMMS/Dockerfile.arm
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM arm32v6/alpine:latest
-
-RUN apk --no-cache --update add jq curl bash
-
-COPY config.json /
-COPY *.sh /
-WORKDIR /
-CMD /service.sh
diff --git a/edge/services/helloMMS/Dockerfile.arm64 b/edge/services/helloMMS/Dockerfile.arm64
deleted file mode 100644
index 0823a9e5..00000000
--- a/edge/services/helloMMS/Dockerfile.arm64
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM arm64v8/alpine:latest
-
-RUN apk --no-cache --update add jq curl bash
-
-COPY config.json /
-COPY *.sh /
-WORKDIR /
-CMD /service.sh
diff --git a/edge/services/helloMMS/Makefile b/edge/services/helloMMS/Makefile
index dc10ee8e..ce092a96 100644
--- a/edge/services/helloMMS/Makefile
+++ b/edge/services/helloMMS/Makefile
@@ -12,7 +12,7 @@ export TIME_OUT:=30
 
 # Build the docker image for the current architecture
 build:
-	docker build -t $(DOCKER_IMAGE_BASE)_$(ARCH):$(SERVICE_VERSION) -f ./Dockerfile.$(ARCH) .
+	docker build --platform linux/$(ARCH) -t $(DOCKER_IMAGE_BASE)_$(ARCH):$(SERVICE_VERSION) -f ./Dockerfile .
 
 # Build the docker image for 3 architectures
 build-all-arches: