From 0adc052dc678882e6cf9f1193d855dbfe65469ca Mon Sep 17 00:00:00 2001
From: Andy Pack <andy@sarsoo.xyz>
Date: Tue, 16 May 2023 17:40:13 +0100
Subject: [PATCH] adding arm image, removing redundant line

---
 .dockerignore            |  2 ++
 .github/workflows/ci.yml | 11 ++++++++---
 Dockerfile.Web           |  1 -
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index a31b4c9..94736f4 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -10,6 +10,8 @@
 *.userosscache
 *.sln.docstates
 
+**/appsettings.Development.json
+
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 297206f..238636b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,13 +49,16 @@ jobs:
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -64,6 +67,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: sarsoo/selector-cli:latest
           file: Dockerfile.CLI
 
@@ -71,6 +75,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: sarsoo/selector-web:latest
           file: Dockerfile.Web
 
diff --git a/Dockerfile.Web b/Dockerfile.Web
index 7448352..72de7a5 100644
--- a/Dockerfile.Web
+++ b/Dockerfile.Web
@@ -23,7 +23,6 @@ COPY . ./
 
 FROM base as publish
 COPY --from=frontend /Selector.Web/wwwroot Selector.Web/wwwroot/
-COPY --from=frontend /Selector.Web/wwwroot Selector.Web/wwwroot/
 RUN dotnet publish Selector.Web/Selector.Web.csproj -c Release -o /app
 
 FROM mcr.microsoft.com/dotnet/aspnet:7.0