From 7f0a37c4c11561fff318c42353f21a882d1c2730 Mon Sep 17 00:00:00 2001
From: Devin Spitz <devin@spitz.onl>
Date: Sun, 24 Jul 2022 14:20:38 +0200
Subject: [PATCH 1/2] Docker compose fix

* Make sure that you remove the file: "/opt/PavlovRconWebserver/appsettings.Production.json"
if it already exists and it's a folder, not a file.

resolve #122
---
 PavlovRconWebserver/docker-compose.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/PavlovRconWebserver/docker-compose.yml b/PavlovRconWebserver/docker-compose.yml
index d93bb0a..7305abc 100644
--- a/PavlovRconWebserver/docker-compose.yml
+++ b/PavlovRconWebserver/docker-compose.yml
@@ -7,8 +7,9 @@ services:
     restart: always
     image: mcr.microsoft.com/dotnet/sdk:5.0
     volumes:
-      - /opt/PavlovRconWebserver/Database/:/build/Database/
-      - /opt/PavlovRconWebserver/appsettings.Production.json:/build/appsettings.Production.json
+      - /opt/PavlovRconWebserver:/build
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Production
     command:
       - bash
       - -c
@@ -16,8 +17,7 @@ services:
         git clone https://github.com/devinSpitz/PavlovRconWebserver.git;
         cd /PavlovRconWebserver/PavlovRconWebserver/;
         dotnet publish -c release -o /build --runtime linux-x64 --self-contained true --framework net5.0;
-        cd /build/;
-        [ ! -f build/Database/Database.db ] && cp /PavlovRconWebserver/PavlovRconWebserver/DefaultDB/Database.db /build/Database/Database.db;
-        [ ! -f build/appsettings.Production.json ] && cp /PavlovRconWebserver/PavlovRconWebserver/appsettings.Development.json /build/appsettings.Production.json;
+        [ ! -f /build/Database/Database.db ] && cp /PavlovRconWebserver/PavlovRconWebserver/DefaultDB/Database.db /build/Database/Database.db;
+        [ ! -f /build/appsettings.Production.json ] && cp "/PavlovRconWebserver/PavlovRconWebserver/appsettings.Development.json" "/build/appsettings.Production.json";
         /build/PavlovRconWebserver --urls=http://*:5001/;
         
\ No newline at end of file

From 9932502def947ee2be19201be4b59267fc50337c Mon Sep 17 00:00:00 2001
From: Devin Spitz <devin@spitz.onl>
Date: Sun, 24 Jul 2022 14:21:56 +0200
Subject: [PATCH 2/2] version pump

---
 PavlovRconWebserver/PavlovRconWebserver.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PavlovRconWebserver/PavlovRconWebserver.csproj b/PavlovRconWebserver/PavlovRconWebserver.csproj
index 518136d..ca3c377 100644
--- a/PavlovRconWebserver/PavlovRconWebserver.csproj
+++ b/PavlovRconWebserver/PavlovRconWebserver.csproj
@@ -6,7 +6,7 @@
     <PackageVersion>0.0.4</PackageVersion>
     <Title>PavlovRconWebserver</Title>
     <Authors>Devin Spitz</Authors>
-    <AssemblyVersion>0.0.5.2</AssemblyVersion>
+    <AssemblyVersion>0.0.5.3</AssemblyVersion>
     <LangVersion>9</LangVersion>
   </PropertyGroup>
   <ItemGroup>