From 1ca710764fe0595e0ee0d85684ada7831b247b58 Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Mon, 4 Jun 2018 00:25:22 +0200
Subject: [PATCH] Fix dockerfiles

---
 .travis.yml            | 1 +
 Dockerfile.Service.arm | 2 +-
 Dockerfile.Service.x64 | 2 +-
 Dockerfile.arm         | 2 +-
 Dockerfile.x64         | 2 +-
 appveyor.yml           | 1 +
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 378b94812..5c8c2781a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,6 +47,7 @@ script:
     publish() {
         if [ "$1" = 'generic' ]; then
             # TODO: Workaround https://github.com/mono/linker/issues/286 until it's resolved
+            # Don't forget to remove it from docker files too
             dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" /nologo "/p:ASFVariant=$1" "/p:LinkDuringPublish=false"
         else
             dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" -r "$1" /nologo "/p:ASFVariant=$1" "/p:CrossGenDuringPublish=false"
diff --git a/Dockerfile.Service.arm b/Dockerfile.Service.arm
index 50f96ebef..0a30b80e2 100644
--- a/Dockerfile.Service.arm
+++ b/Dockerfile.Service.arm
@@ -3,7 +3,7 @@ ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
 COPY . ./
 RUN dotnet --info && \
-    dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=generic && \
+    dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=generic /p:LinkDuringPublish=false && \
     cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh" "ArchiSteamFarm/out/ArchiSteamFarm-Service.sh"
 
 FROM microsoft/dotnet:2.1-runtime-stretch-slim-arm32v7
diff --git a/Dockerfile.Service.x64 b/Dockerfile.Service.x64
index ed58a1f4f..5d6c02a89 100644
--- a/Dockerfile.Service.x64
+++ b/Dockerfile.Service.x64
@@ -3,7 +3,7 @@ ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
 COPY . ./
 RUN dotnet --info && \
-    dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=generic && \
+    dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=generic /p:LinkDuringPublish=false && \
     cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh" "ArchiSteamFarm/out/ArchiSteamFarm-Service.sh"
 
 FROM microsoft/dotnet:2.1-runtime-stretch-slim
diff --git a/Dockerfile.arm b/Dockerfile.arm
index 5a631211a..b3589cb62 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -3,7 +3,7 @@ ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
 COPY . ./
 RUN dotnet --info && \
-    dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=docker && \
+    dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=docker /p:LinkDuringPublish=false && \
     cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/ArchiSteamFarm.sh"
 
 FROM microsoft/dotnet:2.1-runtime-stretch-slim-arm32v7
diff --git a/Dockerfile.x64 b/Dockerfile.x64
index 95eb71774..5e3b2dc1c 100644
--- a/Dockerfile.x64
+++ b/Dockerfile.x64
@@ -3,7 +3,7 @@ ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
 COPY . ./
 RUN dotnet --info && \
-    dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=docker && \
+    dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=docker /p:LinkDuringPublish=false && \
     cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/ArchiSteamFarm.sh"
 
 FROM microsoft/dotnet:2.1-runtime-stretch-slim
diff --git a/appveyor.yml b/appveyor.yml
index 387d9f957..91dff90f5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -92,6 +92,7 @@ after_test:
 
         if ($variant -like 'generic*') {
             # TODO: Workaround https://github.com/mono/linker/issues/286 until it's resolved
+            # Don't forget to remove it from docker files too
             dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -f "$targetFramework" -o "out\$variant" /nologo "/p:ASFVariant=$variant" "/p:LinkDuringPublish=false"
         } else {
             dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -f "$targetFramework" -o "out\$variant" -r "$variant" /nologo "/p:ASFVariant=$variant" "/p:CrossGenDuringPublish=false"