From fa01b2acf2bdde80ab0514c40f7992449aaf386b Mon Sep 17 00:00:00 2001 From: JustArchi Date: Fri, 5 Oct 2018 16:06:59 +0200 Subject: [PATCH] Add tests to dockerfiles --- Dockerfile.Service.arm | 7 ++++--- Dockerfile.Service.x64 | 7 ++++--- Dockerfile.arm | 7 ++++--- Dockerfile.x64 | 7 ++++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Dockerfile.Service.arm b/Dockerfile.Service.arm index 5039cefb6..3d9e5b4ce 100644 --- a/Dockerfile.Service.arm +++ b/Dockerfile.Service.arm @@ -12,13 +12,14 @@ WORKDIR /app COPY --from=build-node /app/dist ASF-ui/dist COPY ArchiSteamFarm ArchiSteamFarm RUN dotnet --info && \ - 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" + 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 && \ + cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm-Service.sh" FROM microsoft/dotnet:2.1-runtime-stretch-slim-arm32v7 AS runtime ENV ASPNETCORE_URLS= LABEL maintainer="JustArchi " EXPOSE 1242 WORKDIR /app -COPY --from=build-dotnet /app/ArchiSteamFarm/out . +COPY --from=build-dotnet /app/ArchiSteamFarm/out/publish . ENTRYPOINT ["./ArchiSteamFarm-Service.sh", "--no-restart", "--process-required", "--system-required"] diff --git a/Dockerfile.Service.x64 b/Dockerfile.Service.x64 index 480dcbccb..0e4315ab7 100644 --- a/Dockerfile.Service.x64 +++ b/Dockerfile.Service.x64 @@ -12,13 +12,14 @@ WORKDIR /app COPY --from=build-node /app/dist ASF-ui/dist COPY ArchiSteamFarm ArchiSteamFarm RUN dotnet --info && \ - 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" + 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 && \ + cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm-Service.sh" FROM microsoft/dotnet:2.1-runtime-stretch-slim AS runtime ENV ASPNETCORE_URLS= LABEL maintainer="JustArchi " EXPOSE 1242 WORKDIR /app -COPY --from=build-dotnet /app/ArchiSteamFarm/out . +COPY --from=build-dotnet /app/ArchiSteamFarm/out/publish . ENTRYPOINT ["./ArchiSteamFarm-Service.sh", "--no-restart", "--process-required", "--system-required"] diff --git a/Dockerfile.arm b/Dockerfile.arm index 7e5eab74e..36f5813eb 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -12,13 +12,14 @@ WORKDIR /app COPY --from=build-node /app/dist ASF-ui/dist COPY ArchiSteamFarm ArchiSteamFarm RUN dotnet --info && \ - 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" + 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 && \ + cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm.sh" FROM microsoft/dotnet:2.1-runtime-stretch-slim-arm32v7 AS runtime ENV ASPNETCORE_URLS= LABEL maintainer="JustArchi " EXPOSE 1242 WORKDIR /app -COPY --from=build-dotnet /app/ArchiSteamFarm/out . +COPY --from=build-dotnet /app/ArchiSteamFarm/out/publish . ENTRYPOINT ["./ArchiSteamFarm.sh", "--no-restart", "--process-required", "--system-required"] diff --git a/Dockerfile.x64 b/Dockerfile.x64 index ea25ed93f..15a84df36 100644 --- a/Dockerfile.x64 +++ b/Dockerfile.x64 @@ -12,13 +12,14 @@ WORKDIR /app COPY --from=build-node /app/dist ASF-ui/dist COPY ArchiSteamFarm ArchiSteamFarm RUN dotnet --info && \ - 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" + 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 && \ + cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm.sh" FROM microsoft/dotnet:2.1-runtime-stretch-slim AS runtime ENV ASPNETCORE_URLS= LABEL maintainer="JustArchi " EXPOSE 1242 WORKDIR /app -COPY --from=build-dotnet /app/ArchiSteamFarm/out . +COPY --from=build-dotnet /app/ArchiSteamFarm/out/publish . ENTRYPOINT ["./ArchiSteamFarm.sh", "--no-restart", "--process-required", "--system-required"]