From 83030416ae5ad2efcb6318b9c67f158563a6fecb Mon Sep 17 00:00:00 2001
From: QuintenQVD0 <josdekurk@gmail.com>
Date: Sun, 6 Nov 2022 15:42:51 +0100
Subject: [PATCH] dotnet for arm64

---
 .github/workflows/dotnet.yml |  4 +++-
 dotnet/2.1/Dockerfile        | 10 ++++------
 dotnet/3.1/Dockerfile        | 11 ++++-------
 dotnet/5/Dockerfile          | 10 ++++------
 dotnet/6/Dockerfile          | 10 ++++------
 5 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index ff621f1..9fa1702 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -22,6 +22,8 @@ jobs:
           - 6
     steps:
       - uses: actions/checkout@v3
+            # Setup QEMU for ARM64 Build
+      - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-buildx-action@v2
         with:
           version: "v0.8.2"
@@ -35,7 +37,7 @@ jobs:
         with:
           context: ./dotnet
           file: ./dotnet/${{ matrix.tag }}/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             ghcr.io/parkervcp/yolks:dotnet_${{ matrix.tag }}
diff --git a/dotnet/2.1/Dockerfile b/dotnet/2.1/Dockerfile
index 440f50b..b6261d5 100644
--- a/dotnet/2.1/Dockerfile
+++ b/dotnet/2.1/Dockerfile
@@ -6,12 +6,10 @@ ENV         DEBIAN_FRONTEND noninteractive
 
 RUN         apt update -y \
             && apt upgrade -y \
-            && apt install -y apt-transport-https wget iproute2 \
-            && wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-            && dpkg -i packages-microsoft-prod.deb \
-            && rm packages-microsoft-prod.deb \
-            && apt update -y \
-            && apt install -y aspnetcore-runtime-2.1 libgdiplus
+            && apt install -y apt-transport-https wget iproute2 libgdiplus \
+            && wget https://dot.net/v1/dotnet-install.sh \   
+            && chmod +x dotnet-install.sh \
+			&& ./dotnet-install.sh -i /usr/local/bin/ -v 2.1.818
 
 USER        container
 ENV         USER=container HOME=/home/container
diff --git a/dotnet/3.1/Dockerfile b/dotnet/3.1/Dockerfile
index f655e82..274b120 100644
--- a/dotnet/3.1/Dockerfile
+++ b/dotnet/3.1/Dockerfile
@@ -6,13 +6,10 @@ ENV         DEBIAN_FRONTEND noninteractive
 
 RUN         apt update -y \
             && apt upgrade -y \
-            && apt install -y apt-transport-https wget iproute2 \
-            && wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-            && dpkg -i packages-microsoft-prod.deb \
-            && rm packages-microsoft-prod.deb \
-            && apt update -y \
-            && apt install -y aspnetcore-runtime-3.1 libgdiplus
-
+            && apt install -y apt-transport-https wget iproute2 libgdiplus \
+            && wget https://dot.net/v1/dotnet-install.sh \   
+            && chmod +x dotnet-install.sh \
+			&& ./dotnet-install.sh -i /usr/local/bin/ -v 3.1.424
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container
diff --git a/dotnet/5/Dockerfile b/dotnet/5/Dockerfile
index 2fe9f19..102e63c 100644
--- a/dotnet/5/Dockerfile
+++ b/dotnet/5/Dockerfile
@@ -6,12 +6,10 @@ ENV         DEBIAN_FRONTEND noninteractive
 
 RUN         apt update -y \
             && apt upgrade -y \
-            && apt install -y apt-transport-https wget iproute2 \
-            && wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-            && dpkg -i packages-microsoft-prod.deb \
-            && rm packages-microsoft-prod.deb \
-            && apt update -y \
-            && apt install -y aspnetcore-runtime-5.0 libgdiplus
+            && apt install -y apt-transport-https wget iproute2 libgdiplus \
+            && wget https://dot.net/v1/dotnet-install.sh \   
+            && chmod +x dotnet-install.sh \
+			&& ./dotnet-install.sh -i /usr/local/bin/ -v 5.0.408
 
 USER        container
 ENV         USER=container HOME=/home/container
diff --git a/dotnet/6/Dockerfile b/dotnet/6/Dockerfile
index 7880a3e..acb756d 100644
--- a/dotnet/6/Dockerfile
+++ b/dotnet/6/Dockerfile
@@ -6,12 +6,10 @@ ENV         DEBIAN_FRONTEND noninteractive
 
 RUN         apt update -y \
             && apt upgrade -y \
-            && apt install -y apt-transport-https wget iproute2 \
-            && wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-            && dpkg -i packages-microsoft-prod.deb \
-            && rm packages-microsoft-prod.deb \
-            && apt update -y \
-            && apt install -y aspnetcore-runtime-6.0 libgdiplus
+            && apt install -y apt-transport-https wget iproute2 libgdiplus \
+            && wget https://dot.net/v1/dotnet-install.sh \   
+            && chmod +x dotnet-install.sh \
+			&& ./dotnet-install.sh -i /usr/local/bin/
 
 USER        container
 ENV         USER=container HOME=/home/container