From 049d9facba7d9de5708edf73653e9d1745b0a78b Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Sat, 24 Nov 2018 15:12:36 +0100
Subject: [PATCH] Dockerfiles: misc

---
 Dockerfile.Service.arm | 6 ++++--
 Dockerfile.Service.x64 | 6 ++++--
 Dockerfile.arm         | 6 ++++--
 Dockerfile.x64         | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Dockerfile.Service.arm b/Dockerfile.Service.arm
index c74c6628d..b743939d9 100644
--- a/Dockerfile.Service.arm
+++ b/Dockerfile.Service.arm
@@ -7,14 +7,16 @@ RUN echo "node: $(node --version)" && \
     npm run-script deploy
 
 FROM microsoft/dotnet:2.1-sdk AS build-dotnet
+ENV CONFIGURATION Release
 ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
 COPY --from=build-node /app/dist ASF-ui/dist
 COPY ArchiSteamFarm ArchiSteamFarm
 COPY ArchiSteamFarm.Tests ArchiSteamFarm.Tests
 RUN dotnet --info && \
-    dotnet test ArchiSteamFarm.Tests -c Release -f "$NET_CORE_VERSION" -o out/test /nologo && \
-    dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out/publish /nologo /p:ASFVariant=generic /p:LinkDuringPublish=false && \
+    dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
+    dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
+    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/publish' /nologo /p:ASFVariant=generic /p:LinkDuringPublish=false && \
     cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm-Service.sh"
 
 FROM microsoft/dotnet:2.1-runtime-stretch-slim-arm32v7 AS runtime
diff --git a/Dockerfile.Service.x64 b/Dockerfile.Service.x64
index a6365330d..7a428a52f 100644
--- a/Dockerfile.Service.x64
+++ b/Dockerfile.Service.x64
@@ -7,14 +7,16 @@ RUN echo "node: $(node --version)" && \
     npm run-script deploy
 
 FROM microsoft/dotnet:2.1-sdk AS build-dotnet
+ENV CONFIGURATION Release
 ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
 COPY --from=build-node /app/dist ASF-ui/dist
 COPY ArchiSteamFarm ArchiSteamFarm
 COPY ArchiSteamFarm.Tests ArchiSteamFarm.Tests
 RUN dotnet --info && \
-    dotnet test ArchiSteamFarm.Tests -c Release -f "$NET_CORE_VERSION" -o out/test /nologo && \
-    dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out/publish /nologo /p:ASFVariant=generic /p:LinkDuringPublish=false && \
+    dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
+    dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
+    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/publish' /nologo /p:ASFVariant=generic /p:LinkDuringPublish=false && \
     cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm-Service.sh"
 
 FROM microsoft/dotnet:2.1-runtime-stretch-slim AS runtime
diff --git a/Dockerfile.arm b/Dockerfile.arm
index 16b767244..66b8420fd 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -7,14 +7,16 @@ RUN echo "node: $(node --version)" && \
     npm run-script deploy
 
 FROM microsoft/dotnet:2.1-sdk AS build-dotnet
+ENV CONFIGURATION Release
 ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
 COPY --from=build-node /app/dist ASF-ui/dist
 COPY ArchiSteamFarm ArchiSteamFarm
 COPY ArchiSteamFarm.Tests ArchiSteamFarm.Tests
 RUN dotnet --info && \
-    dotnet test ArchiSteamFarm.Tests -c Release -f "$NET_CORE_VERSION" -o out/test /nologo && \
-    dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out/publish /nologo /p:ASFVariant=docker /p:LinkDuringPublish=false && \
+    dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
+    dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
+    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/publish' /nologo /p:ASFVariant=docker /p:LinkDuringPublish=false && \
     cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm.sh"
 
 FROM microsoft/dotnet:2.1-runtime-stretch-slim-arm32v7 AS runtime
diff --git a/Dockerfile.x64 b/Dockerfile.x64
index 0984eeda1..bed0c3730 100644
--- a/Dockerfile.x64
+++ b/Dockerfile.x64
@@ -7,14 +7,16 @@ RUN echo "node: $(node --version)" && \
     npm run-script deploy
 
 FROM microsoft/dotnet:2.1-sdk AS build-dotnet
+ENV CONFIGURATION Release
 ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
 COPY --from=build-node /app/dist ASF-ui/dist
 COPY ArchiSteamFarm ArchiSteamFarm
 COPY ArchiSteamFarm.Tests ArchiSteamFarm.Tests
 RUN dotnet --info && \
-    dotnet test ArchiSteamFarm.Tests -c Release -f "$NET_CORE_VERSION" -o out/test /nologo && \
-    dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out/publish /nologo /p:ASFVariant=docker /p:LinkDuringPublish=false && \
+    dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
+    dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/source' /nologo && \
+    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/publish' /nologo /p:ASFVariant=docker /p:LinkDuringPublish=false && \
     cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm.sh"
 
 FROM microsoft/dotnet:2.1-runtime-stretch-slim AS runtime