pimhwang
/
ErsatzTV
mirror of https://github.com/ErsatzTV/ErsatzTV.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

revert windows trimming (#613) 

* Revert "disable trimming in docker"

This reverts commit 5937211bb8.

* Revert "try to reduce windows artifact size"

This reverts commit e32dbd0474.
pull/614/head
Jason Dove 4 years ago committed by GitHub
parent
5937211bb8
commit
a47987a9d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      ErsatzTV/ErsatzTV.csproj
  2. 2
      docker/Dockerfile
  3. 2
      docker/nvidia/Dockerfile
  4. 2
      docker/vaapi/Dockerfile

1
ErsatzTV/ErsatzTV.csproj
Unescape View File

@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
<TargetFramework>net6.0</TargetFramework>
<NoWarn>VSTHRD200</NoWarn>
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
<PublishTrimmed>true</PublishTrimmed>
</PropertyGroup>
<ItemGroup>

2
docker/Dockerfile
Unescape View File

@ -29,7 +29,7 @@ COPY ErsatzTV.Core.Tests/. ./ErsatzTV.Core.Tests/ @@ -29,7 +29,7 @@ COPY ErsatzTV.Core.Tests/. ./ErsatzTV.Core.Tests/
COPY ErsatzTV.Infrastructure/. ./ErsatzTV.Infrastructure/
WORKDIR /source/ErsatzTV
ARG INFO_VERSION="unknown"
RUN dotnet publish -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION} /p:PublishTrimmed=false
RUN dotnet publish -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION}
# final stage/image
FROM runtime-base

2
docker/nvidia/Dockerfile
Unescape View File

@ -23,7 +23,7 @@ COPY ErsatzTV.Core.Tests/. ./ErsatzTV.Core.Tests/ @@ -23,7 +23,7 @@ COPY ErsatzTV.Core.Tests/. ./ErsatzTV.Core.Tests/
COPY ErsatzTV.Infrastructure/. ./ErsatzTV.Infrastructure/
WORKDIR /source/ErsatzTV
ARG INFO_VERSION="unknown"
RUN dotnet publish -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION} /p:PublishTrimmed=false
RUN dotnet publish -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION}
# final stage/image
FROM jasongdove/ffmpeg:5.0-nvidia2004 AS runtime-base

2
docker/vaapi/Dockerfile
Unescape View File

@ -23,7 +23,7 @@ COPY ErsatzTV.Core.Tests/. ./ErsatzTV.Core.Tests/ @@ -23,7 +23,7 @@ COPY ErsatzTV.Core.Tests/. ./ErsatzTV.Core.Tests/
COPY ErsatzTV.Infrastructure/. ./ErsatzTV.Infrastructure/
WORKDIR /source/ErsatzTV
ARG INFO_VERSION="unknown"
RUN dotnet publish -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION} /p:PublishTrimmed=false
RUN dotnet publish -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION}
# final stage/image
FROM jasongdove/ffmpeg:5.0-vaapi2004 AS runtime-base

Write Preview
Loading…
Cancel
Save