From 197305eb190c0d5985050744940734f25eecdb05 Mon Sep 17 00:00:00 2001
From: Roger Far <roger@versluis.ca>
Date: Sat, 23 Jan 2021 07:31:26 -0700
Subject: [PATCH] Fixed docker build file to compule arm64v8.

---
 Dockerfile         | 6 ++++--
 docker-publish.bat | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ca2445c..5a1d42d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
+ARG ARCH=
+
 # Stage 1 - Build the frontend
 FROM amd64/node:15.5-buster AS node-build-env
 
@@ -9,7 +11,7 @@ RUN npm ci
 RUN npx ng build --prod --output-path=out
 
 # Stage 2 - Build the backend
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS dotnet-build-env
+FROM mcr.microsoft.com/dotnet/sdk:5.0.102-1-buster-slim-${ARCH} AS dotnet-build-env
 
 RUN mkdir /appserver
 WORKDIR /appserver
@@ -20,7 +22,7 @@ RUN dotnet build -c Release
 RUN dotnet publish -c Release -o out
 
 # Stage 3 - Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:5.0.2-buster-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0.2-buster-slim-${ARCH} AS base
 RUN mkdir /app
 WORKDIR /app
 COPY --from=dotnet-build-env /appserver/out .
diff --git a/docker-publish.bat b/docker-publish.bat
index 73348f3..7b4f6f3 100644
--- a/docker-publish.bat
+++ b/docker-publish.bat
@@ -1,7 +1,7 @@
-docker build --tag rogerfar/rdtclient:amd64 --build-arg ARCH=amd64/ .
+docker build --tag rogerfar/rdtclient:amd64 --build-arg ARCH=amd64 .
 docker push rogerfar/rdtclient:amd64
 
-docker build -t rogerfar/rdtclient:arm64v8 --build-arg ARCH=arm64v8/ .
+docker build -t rogerfar/rdtclient:arm64v8 --build-arg ARCH=arm64v8 .
 docker push rogerfar/rdtclient:arm64v8
 
 docker manifest create rogerfar/rdtclient:latest --amend rogerfar/rdtclient:amd64 --amend rogerfar/rdtclient:arm64v8