Fix dockerfiles

This commit is contained in:
JustArchi
2018-06-04 00:25:22 +02:00
parent 22c563b56b
commit 1ca710764f
6 changed files with 6 additions and 4 deletions

View File

@@ -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"

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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"