From a13569e5fb048eef454bb75b86465233849c576a Mon Sep 17 00:00:00 2001 From: JustArchi Date: Sat, 13 Jun 2020 17:05:26 +0200 Subject: [PATCH] Add STEAM_TOKEN_DUMPER_TOKEN logic to docker images --- Dockerfile.Service.arm | 14 +++++++++----- Dockerfile.Service.arm64 | 14 +++++++++----- Dockerfile.Service.x64 | 14 +++++++++----- Dockerfile.arm | 14 +++++++++----- Dockerfile.arm64 | 14 +++++++++----- Dockerfile.x64 | 14 +++++++++----- 6 files changed, 54 insertions(+), 30 deletions(-) diff --git a/Dockerfile.Service.arm b/Dockerfile.Service.arm index e34de0fb3..b74263c6a 100644 --- a/Dockerfile.Service.arm +++ b/Dockerfile.Service.arm @@ -7,13 +7,16 @@ RUN echo "node: $(node --version)" && \ npm run deploy FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-dotnet +ARG STEAM_TOKEN_DUMPER_TOKEN ENV CONFIGURATION Release ENV DOTNET_CLI_TELEMETRY_OPTOUT 1 ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 ENV NET_CORE_VERSION netcoreapp3.1 +ENV STEAM_TOKEN_DUMPER_NAME ArchiSteamFarm.OfficialPlugins.SteamTokenDumper WORKDIR /app COPY --from=build-node /app/dist ASF-ui/dist COPY ArchiSteamFarm ArchiSteamFarm +COPY ArchiSteamFarm.OfficialPlugins.SteamTokenDumper ArchiSteamFarm.OfficialPlugins.SteamTokenDumper COPY ArchiSteamFarm.Tests ArchiSteamFarm.Tests COPY resources resources COPY Directory.Build.props Directory.Build.props @@ -21,11 +24,12 @@ RUN dotnet --info && \ # TODO: Remove workaround for https://github.com/microsoft/msbuild/issues/3897 when it's no longer needed if [ -f "ArchiSteamFarm/Localization/Strings.zh-CN.resx" ]; then ln -s "Strings.zh-CN.resx" "ArchiSteamFarm/Localization/Strings.zh-Hans.resx"; fi && \ if [ -f "ArchiSteamFarm/Localization/Strings.zh-TW.resx" ]; then ln -s "Strings.zh-TW.resx" "ArchiSteamFarm/Localization/Strings.zh-Hant.resx"; fi && \ - dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ - dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ + if [ -n "${STEAM_TOKEN_DUMPER_TOKEN-}" ] && [ -f "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs" ]; then sed -i "s/STEAM_TOKEN_DUMPER_TOKEN/${STEAM_TOKEN_DUMPER_TOKEN}/g" "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs"; fi && \ + dotnet publish "${STEAM_TOKEN_DUMPER_NAME}" -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ - dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=linux-arm -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-arm --nologo && \ - if [ -d "ArchiSteamFarm/overlay/linux-arm" ]; then cp "ArchiSteamFarm/overlay/linux-arm/"* "out"; fi + dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/result" -p:ASFVariant=linux-arm -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-arm --nologo && \ + if [ -d "ArchiSteamFarm/overlay/linux-arm" ]; then cp "ArchiSteamFarm/overlay/linux-arm/"* "out/result"; fi && \ + if [ -f "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/${STEAM_TOKEN_DUMPER_NAME}.dll" ]; then mkdir -p "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; cp "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/${STEAM_TOKEN_DUMPER_NAME}.dll" "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; fi FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-buster-slim-arm32v7 AS runtime ENV ASPNETCORE_URLS= @@ -34,7 +38,7 @@ ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 LABEL maintainer="JustArchi " EXPOSE 1242 WORKDIR /app -COPY --from=build-dotnet /app/out . +COPY --from=build-dotnet /app/out/result . VOLUME ["/app/config", "/app/logs", "/app/plugins"] HEALTHCHECK CMD ["pidof", "-q", "ArchiSteamFarm"] ENTRYPOINT ["./ArchiSteamFarm-Service.sh", "--no-restart", "--process-required", "--system-required"] diff --git a/Dockerfile.Service.arm64 b/Dockerfile.Service.arm64 index f8ca3713f..62c98037d 100644 --- a/Dockerfile.Service.arm64 +++ b/Dockerfile.Service.arm64 @@ -7,13 +7,16 @@ RUN echo "node: $(node --version)" && \ npm run deploy FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-dotnet +ARG STEAM_TOKEN_DUMPER_TOKEN ENV CONFIGURATION Release ENV DOTNET_CLI_TELEMETRY_OPTOUT 1 ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 ENV NET_CORE_VERSION netcoreapp3.1 +ENV STEAM_TOKEN_DUMPER_NAME ArchiSteamFarm.OfficialPlugins.SteamTokenDumper WORKDIR /app COPY --from=build-node /app/dist ASF-ui/dist COPY ArchiSteamFarm ArchiSteamFarm +COPY ArchiSteamFarm.OfficialPlugins.SteamTokenDumper ArchiSteamFarm.OfficialPlugins.SteamTokenDumper COPY ArchiSteamFarm.Tests ArchiSteamFarm.Tests COPY resources resources COPY Directory.Build.props Directory.Build.props @@ -21,11 +24,12 @@ RUN dotnet --info && \ # TODO: Remove workaround for https://github.com/microsoft/msbuild/issues/3897 when it's no longer needed if [ -f "ArchiSteamFarm/Localization/Strings.zh-CN.resx" ]; then ln -s "Strings.zh-CN.resx" "ArchiSteamFarm/Localization/Strings.zh-Hans.resx"; fi && \ if [ -f "ArchiSteamFarm/Localization/Strings.zh-TW.resx" ]; then ln -s "Strings.zh-TW.resx" "ArchiSteamFarm/Localization/Strings.zh-Hant.resx"; fi && \ - dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ - dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ + if [ -n "${STEAM_TOKEN_DUMPER_TOKEN-}" ] && [ -f "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs" ]; then sed -i "s/STEAM_TOKEN_DUMPER_TOKEN/${STEAM_TOKEN_DUMPER_TOKEN}/g" "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs"; fi && \ + dotnet publish "${STEAM_TOKEN_DUMPER_NAME}" -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ - dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=linux-arm64 -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-arm64 --nologo && \ - if [ -d "ArchiSteamFarm/overlay/linux-arm64" ]; then cp "ArchiSteamFarm/overlay/linux-arm64/"* "out"; fi + dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/result" -p:ASFVariant=linux-arm64 -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-arm64 --nologo && \ + if [ -d "ArchiSteamFarm/overlay/linux-arm64" ]; then cp "ArchiSteamFarm/overlay/linux-arm64/"* "out/result"; fi && \ + if [ -f "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/${STEAM_TOKEN_DUMPER_NAME}.dll" ]; then mkdir -p "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; cp "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/${STEAM_TOKEN_DUMPER_NAME}.dll" "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; fi FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-buster-slim-arm64v8 AS runtime ENV ASPNETCORE_URLS= @@ -34,7 +38,7 @@ ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 LABEL maintainer="JustArchi " EXPOSE 1242 WORKDIR /app -COPY --from=build-dotnet /app/out . +COPY --from=build-dotnet /app/out/result . VOLUME ["/app/config", "/app/logs", "/app/plugins"] HEALTHCHECK CMD ["pidof", "-q", "ArchiSteamFarm"] ENTRYPOINT ["./ArchiSteamFarm-Service.sh", "--no-restart", "--process-required", "--system-required"] diff --git a/Dockerfile.Service.x64 b/Dockerfile.Service.x64 index 5fbc1703e..c52fd4f2d 100644 --- a/Dockerfile.Service.x64 +++ b/Dockerfile.Service.x64 @@ -7,13 +7,16 @@ RUN echo "node: $(node --version)" && \ npm run deploy FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-dotnet +ARG STEAM_TOKEN_DUMPER_TOKEN ENV CONFIGURATION Release ENV DOTNET_CLI_TELEMETRY_OPTOUT 1 ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 ENV NET_CORE_VERSION netcoreapp3.1 +ENV STEAM_TOKEN_DUMPER_NAME ArchiSteamFarm.OfficialPlugins.SteamTokenDumper WORKDIR /app COPY --from=build-node /app/dist ASF-ui/dist COPY ArchiSteamFarm ArchiSteamFarm +COPY ArchiSteamFarm.OfficialPlugins.SteamTokenDumper ArchiSteamFarm.OfficialPlugins.SteamTokenDumper COPY ArchiSteamFarm.Tests ArchiSteamFarm.Tests COPY resources resources COPY Directory.Build.props Directory.Build.props @@ -21,11 +24,12 @@ RUN dotnet --info && \ # TODO: Remove workaround for https://github.com/microsoft/msbuild/issues/3897 when it's no longer needed if [ -f "ArchiSteamFarm/Localization/Strings.zh-CN.resx" ]; then ln -s "Strings.zh-CN.resx" "ArchiSteamFarm/Localization/Strings.zh-Hans.resx"; fi && \ if [ -f "ArchiSteamFarm/Localization/Strings.zh-TW.resx" ]; then ln -s "Strings.zh-TW.resx" "ArchiSteamFarm/Localization/Strings.zh-Hant.resx"; fi && \ - dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ - dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ + if [ -n "${STEAM_TOKEN_DUMPER_TOKEN-}" ] && [ -f "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs" ]; then sed -i "s/STEAM_TOKEN_DUMPER_TOKEN/${STEAM_TOKEN_DUMPER_TOKEN}/g" "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs"; fi && \ + dotnet publish "${STEAM_TOKEN_DUMPER_NAME}" -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ - dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=linux-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-x64 --nologo && \ - if [ -d "ArchiSteamFarm/overlay/linux-x64" ]; then cp "ArchiSteamFarm/overlay/linux-x64/"* "out"; fi + dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/result" -p:ASFVariant=linux-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-x64 --nologo && \ + if [ -d "ArchiSteamFarm/overlay/linux-x64" ]; then cp "ArchiSteamFarm/overlay/linux-x64/"* "out/result"; fi && \ + if [ -f "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/${STEAM_TOKEN_DUMPER_NAME}.dll" ]; then mkdir -p "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; cp "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/${STEAM_TOKEN_DUMPER_NAME}.dll" "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; fi FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-buster-slim AS runtime ENV ASPNETCORE_URLS= @@ -34,7 +38,7 @@ ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 LABEL maintainer="JustArchi " EXPOSE 1242 WORKDIR /app -COPY --from=build-dotnet /app/out . +COPY --from=build-dotnet /app/out/result . VOLUME ["/app/config", "/app/logs", "/app/plugins"] HEALTHCHECK CMD ["pidof", "-q", "ArchiSteamFarm"] ENTRYPOINT ["./ArchiSteamFarm-Service.sh", "--no-restart", "--process-required", "--system-required"] diff --git a/Dockerfile.arm b/Dockerfile.arm index de0e2edc7..7f1e4e640 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -7,13 +7,16 @@ RUN echo "node: $(node --version)" && \ npm run deploy FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-dotnet +ARG STEAM_TOKEN_DUMPER_TOKEN ENV CONFIGURATION Release ENV DOTNET_CLI_TELEMETRY_OPTOUT 1 ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 ENV NET_CORE_VERSION netcoreapp3.1 +ENV STEAM_TOKEN_DUMPER_NAME ArchiSteamFarm.OfficialPlugins.SteamTokenDumper WORKDIR /app COPY --from=build-node /app/dist ASF-ui/dist COPY ArchiSteamFarm ArchiSteamFarm +COPY ArchiSteamFarm.OfficialPlugins.SteamTokenDumper ArchiSteamFarm.OfficialPlugins.SteamTokenDumper COPY ArchiSteamFarm.Tests ArchiSteamFarm.Tests COPY resources resources COPY Directory.Build.props Directory.Build.props @@ -21,11 +24,12 @@ RUN dotnet --info && \ # TODO: Remove workaround for https://github.com/microsoft/msbuild/issues/3897 when it's no longer needed if [ -f "ArchiSteamFarm/Localization/Strings.zh-CN.resx" ]; then ln -s "Strings.zh-CN.resx" "ArchiSteamFarm/Localization/Strings.zh-Hans.resx"; fi && \ if [ -f "ArchiSteamFarm/Localization/Strings.zh-TW.resx" ]; then ln -s "Strings.zh-TW.resx" "ArchiSteamFarm/Localization/Strings.zh-Hant.resx"; fi && \ - dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ - dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ + if [ -n "${STEAM_TOKEN_DUMPER_TOKEN-}" ] && [ -f "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs" ]; then sed -i "s/STEAM_TOKEN_DUMPER_TOKEN/${STEAM_TOKEN_DUMPER_TOKEN}/g" "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs"; fi && \ + dotnet publish "${STEAM_TOKEN_DUMPER_NAME}" -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ - dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=docker -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ - if [ -d "ArchiSteamFarm/overlay/generic" ]; then cp "ArchiSteamFarm/overlay/generic/"* "out"; fi + dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/result" -p:ASFVariant=docker -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ + if [ -d "ArchiSteamFarm/overlay/generic" ]; then cp "ArchiSteamFarm/overlay/generic/"* "out/result"; fi && \ + if [ -f "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/${STEAM_TOKEN_DUMPER_NAME}.dll" ]; then mkdir -p "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; cp "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/${STEAM_TOKEN_DUMPER_NAME}.dll" "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; fi FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim-arm32v7 AS runtime ENV ASPNETCORE_URLS= @@ -34,7 +38,7 @@ ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 LABEL maintainer="JustArchi " EXPOSE 1242 WORKDIR /app -COPY --from=build-dotnet /app/out . +COPY --from=build-dotnet /app/out/result . VOLUME ["/app/config", "/app/logs", "/app/plugins"] HEALTHCHECK CMD ["pidof", "-q", "dotnet"] ENTRYPOINT ["./ArchiSteamFarm.sh", "--no-restart", "--process-required", "--system-required"] diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 8adad6477..ede147137 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -7,13 +7,16 @@ RUN echo "node: $(node --version)" && \ npm run deploy FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-dotnet +ARG STEAM_TOKEN_DUMPER_TOKEN ENV CONFIGURATION Release ENV DOTNET_CLI_TELEMETRY_OPTOUT 1 ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 ENV NET_CORE_VERSION netcoreapp3.1 +ENV STEAM_TOKEN_DUMPER_NAME ArchiSteamFarm.OfficialPlugins.SteamTokenDumper WORKDIR /app COPY --from=build-node /app/dist ASF-ui/dist COPY ArchiSteamFarm ArchiSteamFarm +COPY ArchiSteamFarm.OfficialPlugins.SteamTokenDumper ArchiSteamFarm.OfficialPlugins.SteamTokenDumper COPY ArchiSteamFarm.Tests ArchiSteamFarm.Tests COPY resources resources COPY Directory.Build.props Directory.Build.props @@ -21,11 +24,12 @@ RUN dotnet --info && \ # TODO: Remove workaround for https://github.com/microsoft/msbuild/issues/3897 when it's no longer needed if [ -f "ArchiSteamFarm/Localization/Strings.zh-CN.resx" ]; then ln -s "Strings.zh-CN.resx" "ArchiSteamFarm/Localization/Strings.zh-Hans.resx"; fi && \ if [ -f "ArchiSteamFarm/Localization/Strings.zh-TW.resx" ]; then ln -s "Strings.zh-TW.resx" "ArchiSteamFarm/Localization/Strings.zh-Hant.resx"; fi && \ - dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ - dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ + if [ -n "${STEAM_TOKEN_DUMPER_TOKEN-}" ] && [ -f "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs" ]; then sed -i "s/STEAM_TOKEN_DUMPER_TOKEN/${STEAM_TOKEN_DUMPER_TOKEN}/g" "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs"; fi && \ + dotnet publish "${STEAM_TOKEN_DUMPER_NAME}" -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ - dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=docker -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ - if [ -d "ArchiSteamFarm/overlay/generic" ]; then cp "ArchiSteamFarm/overlay/generic/"* "out"; fi + dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/result" -p:ASFVariant=docker -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ + if [ -d "ArchiSteamFarm/overlay/generic" ]; then cp "ArchiSteamFarm/overlay/generic/"* "out/result"; fi && \ + if [ -f "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/${STEAM_TOKEN_DUMPER_NAME}.dll" ]; then mkdir -p "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; cp "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/${STEAM_TOKEN_DUMPER_NAME}.dll" "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; fi FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim-arm64v8 AS runtime ENV ASPNETCORE_URLS= @@ -34,7 +38,7 @@ ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 LABEL maintainer="JustArchi " EXPOSE 1242 WORKDIR /app -COPY --from=build-dotnet /app/out . +COPY --from=build-dotnet /app/out/result . VOLUME ["/app/config", "/app/logs", "/app/plugins"] HEALTHCHECK CMD ["pidof", "-q", "dotnet"] ENTRYPOINT ["./ArchiSteamFarm.sh", "--no-restart", "--process-required", "--system-required"] diff --git a/Dockerfile.x64 b/Dockerfile.x64 index 0ee4df1a3..f7d5fd599 100644 --- a/Dockerfile.x64 +++ b/Dockerfile.x64 @@ -7,13 +7,16 @@ RUN echo "node: $(node --version)" && \ npm run deploy FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-dotnet +ARG STEAM_TOKEN_DUMPER_TOKEN ENV CONFIGURATION Release ENV DOTNET_CLI_TELEMETRY_OPTOUT 1 ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 ENV NET_CORE_VERSION netcoreapp3.1 +ENV STEAM_TOKEN_DUMPER_NAME ArchiSteamFarm.OfficialPlugins.SteamTokenDumper WORKDIR /app COPY --from=build-node /app/dist ASF-ui/dist COPY ArchiSteamFarm ArchiSteamFarm +COPY ArchiSteamFarm.OfficialPlugins.SteamTokenDumper ArchiSteamFarm.OfficialPlugins.SteamTokenDumper COPY ArchiSteamFarm.Tests ArchiSteamFarm.Tests COPY resources resources COPY Directory.Build.props Directory.Build.props @@ -21,11 +24,12 @@ RUN dotnet --info && \ # TODO: Remove workaround for https://github.com/microsoft/msbuild/issues/3897 when it's no longer needed if [ -f "ArchiSteamFarm/Localization/Strings.zh-CN.resx" ]; then ln -s "Strings.zh-CN.resx" "ArchiSteamFarm/Localization/Strings.zh-Hans.resx"; fi && \ if [ -f "ArchiSteamFarm/Localization/Strings.zh-TW.resx" ]; then ln -s "Strings.zh-TW.resx" "ArchiSteamFarm/Localization/Strings.zh-Hant.resx"; fi && \ - dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ - dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ + if [ -n "${STEAM_TOKEN_DUMPER_TOKEN-}" ] && [ -f "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs" ]; then sed -i "s/STEAM_TOKEN_DUMPER_TOKEN/${STEAM_TOKEN_DUMPER_TOKEN}/g" "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs"; fi && \ + dotnet publish "${STEAM_TOKEN_DUMPER_NAME}" -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ - dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=docker -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ - if [ -d "ArchiSteamFarm/overlay/generic" ]; then cp "ArchiSteamFarm/overlay/generic/"* "out"; fi + dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/result" -p:ASFVariant=docker -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ + if [ -d "ArchiSteamFarm/overlay/generic" ]; then cp "ArchiSteamFarm/overlay/generic/"* "out/result"; fi && \ + if [ -f "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/${STEAM_TOKEN_DUMPER_NAME}.dll" ]; then mkdir -p "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; cp "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/${STEAM_TOKEN_DUMPER_NAME}.dll" "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; fi FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS runtime ENV ASPNETCORE_URLS= @@ -34,7 +38,7 @@ ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 LABEL maintainer="JustArchi " EXPOSE 1242 WORKDIR /app -COPY --from=build-dotnet /app/out . +COPY --from=build-dotnet /app/out/result . VOLUME ["/app/config", "/app/logs", "/app/plugins"] HEALTHCHECK CMD ["pidof", "-q", "dotnet"] ENTRYPOINT ["./ArchiSteamFarm.sh", "--no-restart", "--process-required", "--system-required"]