From 65a528e7fe655e07c3f9b4131b2c98d65c86e1e0 Mon Sep 17 00:00:00 2001
From: Oleksii Holub <1935960+Tyrrrz@users.noreply.github.com>
Date: Sat, 18 Jun 2022 22:37:24 +0300
Subject: [PATCH] Simplify dockerfile

---
 .github/workflows/docker.yml       |  6 +++---
 DiscordChatExporter.Cli.dockerfile | 18 ++++++++++++++++++
 DiscordChatExporter.sln            |  2 +-
 Dockerfile                         | 20 --------------------
 4 files changed, 22 insertions(+), 24 deletions(-)
 create mode 100644 DiscordChatExporter.Cli.dockerfile
 delete mode 100644 Dockerfile

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c8d5018..dc433aa 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build container
-        run: docker build .
+        run: docker build -f DiscordChatExporter.Cli.dockerfile .
 
   deploy-latest:
     if: ${{ github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == 'master' }}
@@ -25,7 +25,7 @@ jobs:
         run: docker login -u tyrrrz -p ${{ secrets.DOCKER_TOKEN }}
 
       - name: Build container
-        run: docker build -t tyrrrz/discordchatexporter:latest .
+        run: docker build -f DiscordChatExporter.Cli.dockerfile -t tyrrrz/discordchatexporter:latest .
 
       - name: Push container
         run: docker push tyrrrz/discordchatexporter:latest
@@ -46,7 +46,7 @@ jobs:
         run: docker login -u tyrrrz -p ${{ secrets.DOCKER_TOKEN }}
 
       - name: Build container
-        run: docker build -t tyrrrz/discordchatexporter:stable -t tyrrrz/discordchatexporter:${{ steps.get_version.outputs.tag }} .
+        run: docker build -f DiscordChatExporter.Cli.dockerfile -t tyrrrz/discordchatexporter:stable -t tyrrrz/discordchatexporter:${{ steps.get_version.outputs.tag }} .
 
       - name: Push container (stable)
         run: docker push tyrrrz/discordchatexporter:stable
diff --git a/DiscordChatExporter.Cli.dockerfile b/DiscordChatExporter.Cli.dockerfile
new file mode 100644
index 0000000..2792876
--- /dev/null
+++ b/DiscordChatExporter.Cli.dockerfile
@@ -0,0 +1,18 @@
+# Build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+
+COPY favicon.ico ./
+COPY NuGet.config ./
+COPY Directory.Build.props ./
+COPY DiscordChatExporter.Core ./DiscordChatExporter.Core
+COPY DiscordChatExporter.Cli ./DiscordChatExporter.Cli
+
+RUN dotnet publish DiscordChatExporter.Cli -c Release -o ./publish
+
+# Run
+FROM mcr.microsoft.com/dotnet/runtime:6.0 AS run
+
+COPY --from=build ./publish ./
+
+WORKDIR ./out
+ENTRYPOINT ["dotnet", "/DiscordChatExporter.Cli.dll"]
\ No newline at end of file
diff --git a/DiscordChatExporter.sln b/DiscordChatExporter.sln
index 027c60c..deae0b8 100644
--- a/DiscordChatExporter.sln
+++ b/DiscordChatExporter.sln
@@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		License.txt = License.txt
 		Readme.md = Readme.md
 		Directory.Build.props = Directory.Build.props
-		Dockerfile = Dockerfile
+		DiscordChatExporter.Cli.dockerfile = DiscordChatExporter.Cli.dockerfile
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordChatExporter.Gui", "DiscordChatExporter.Gui\DiscordChatExporter.Gui.csproj", "{732A67AF-93DE-49DF-B10F-FD74710B7863}"
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 9e1c849..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Build
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-
-COPY favicon.ico ./
-COPY NuGet.config ./
-COPY Directory.Build.props ./
-COPY DiscordChatExporter.Core DiscordChatExporter.Core
-COPY DiscordChatExporter.Cli DiscordChatExporter.Cli
-
-RUN dotnet publish DiscordChatExporter.Cli -o DiscordChatExporter.Cli/publish -c Release
-
-# Run
-FROM mcr.microsoft.com/dotnet/runtime:6.0 AS run
-WORKDIR /app
-
-COPY --from=build /src/DiscordChatExporter.Cli/publish ./
-
-WORKDIR /app/out
-ENTRYPOINT ["dotnet", "/app/DiscordChatExporter.Cli.dll"]