Use installation script for dotnet to support arm64 + amd64

debricked · Sep 21, 2023 · a72de08 · a72de08
1 parent 3f1827f
commit a72de08
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -3,7 +3,7 @@ name: Docker
 on:
   push:
     branches:
-      - main
+      - fix-debian-image
     tags:
       - 'v*'
 
@@ -67,6 +67,6 @@ jobs:
           file: build/docker/${{ matrix.docker-os }}.Dockerfile
           target: ${{ matrix.stage }}
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
+          push: false
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile
@@ -64,6 +64,14 @@ RUN npm install -g npm@latest
 RUN npm install --global yarn
 
 
-RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && dpkg -i packages-microsoft-prod.deb
-RUN rm packages-microsoft-prod.deb
-RUN apt -y update && apt -y upgrade && apt install -y dotnet-sdk-7.0
+
+# Package manager installs are only supported on the x64 architecture. Other architectures, such as Arm, must install .NET by some other means such as with Snap, an installer script, or through a manual binary installation.
+# RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && dpkg -i packages-microsoft-prod.deb
+# RUN rm packages-microsoft-prod.deb
+# RUN apt -y update && apt -y upgrade && apt install -y dotnet-sdk-7.0
+
+RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh
+RUN chmod +x ./dotnet-install.sh
+RUN ./dotnet-install.sh --channel 7.0
+ENV DOTNET_ROOT $HOME/.dotnet
+ENV PATH $DOTNET_ROOT:$DOTNET_ROOT/tools:$PATH