From e261edde8bbbdb3c5982ee45f3f04028184978b8 Mon Sep 17 00:00:00 2001
From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
Date: Thu, 11 May 2023 16:07:06 +0300
Subject: [PATCH] Re-add the Docker build job on GitHub Actions

---
 .github/workflows/docker.yml       | 24 ++++++++++++++++++++++++
 .github/workflows/main.yml         |  8 ++++----
 DiscordChatExporter.Cli.dockerfile | 12 ++++++------
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index aba12cce..40967f00 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,6 +3,30 @@ name: docker
 on: [push, pull_request]
 
 jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build image
+        run: >
+          docker buildx build
+          --file DiscordChatExporter.Cli.dockerfile
+          --platform linux/amd64,linux/arm64
+          --output docker/
+          .
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: DiscordChatExporter.Cli.Docker
+          path: docker/
+
   deploy-latest:
     if: ${{ github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == 'master' }}
     runs-on: ubuntu-latest
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 14c4e861..e760522a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -59,26 +59,26 @@ jobs:
       - name: Publish (CLI)
         run: >
           dotnet publish DiscordChatExporter.Cli
-          --output DiscordChatExporter.Cli/bin/Publish/
+          --output DiscordChatExporter.Cli/publish/
           --configuration Release
 
       - name: Publish (GUI)
         run: >
           dotnet publish DiscordChatExporter.Gui
-          --output DiscordChatExporter.Gui/bin/Publish/
+          --output DiscordChatExporter.Gui/publish/
           --configuration Release
 
       - name: Upload artifacts (CLI)
         uses: actions/upload-artifact@v3
         with:
           name: DiscordChatExporter.Cli
-          path: DiscordChatExporter.Cli/bin/Publish/
+          path: DiscordChatExporter.Cli/publish/
 
       - name: Upload artifacts (GUI)
         uses: actions/upload-artifact@v3
         with:
           name: DiscordChatExporter
-          path: DiscordChatExporter.Gui/bin/Publish/
+          path: DiscordChatExporter.Gui/publish/
 
   deploy:
     if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
diff --git a/DiscordChatExporter.Cli.dockerfile b/DiscordChatExporter.Cli.dockerfile
index 388b3e0c..391f77a7 100644
--- a/DiscordChatExporter.Cli.dockerfile
+++ b/DiscordChatExporter.Cli.dockerfile
@@ -14,11 +14,11 @@ ARG TARGETARCH
 
 WORKDIR /build
 
-COPY favicon.ico ./
-COPY NuGet.config ./
-COPY Directory.Build.props ./
-COPY DiscordChatExporter.Core ./DiscordChatExporter.Core
-COPY DiscordChatExporter.Cli ./DiscordChatExporter.Cli
+COPY favicon.ico .
+COPY NuGet.config .
+COPY Directory.Build.props .
+COPY DiscordChatExporter.Core DiscordChatExporter.Core
+COPY DiscordChatExporter.Cli DiscordChatExporter.Cli
 
 # Publish a self-contained assembly so we can use a slimmer runtime image
 RUN dotnet publish DiscordChatExporter.Cli \
@@ -26,7 +26,7 @@ RUN dotnet publish DiscordChatExporter.Cli \
     --self-contained \
     --use-current-runtime \
     --arch $TARGETARCH \
-    --output ./publish
+    --output publish/
 
 # -- Run
 # Use `runtime-deps` instead of `runtime` because we have a self-contained assembly