diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-09-27 23:02:18 -0400 |
|---|---|---|
| committer | Anthony Lavado <anthony@lavado.ca> | 2019-09-27 23:02:18 -0400 |
| commit | 75b7c9ac36ab44e7b49c444bb7f4b710e751f3f0 (patch) | |
| tree | 2bb3376732a750887055f3250b62cd0eb6120b51 | |
| parent | e4d5e5bf91ca3129b4701463ed5c6bdce5b2115b (diff) | |
Do explicit dotnet publish in Dockerfiles (#1801)
The common.build.sh script was removed in #1793 but the Dockerfiles
still used this to perform the dotnet publish. Remove that call and do
the publish explicitly.
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | Dockerfile.arm | 3 | ||||
| -rw-r--r-- | Dockerfile.arm64 | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/Dockerfile b/Dockerfile index 483345e39..69cb5e0dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,7 @@ FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION} as builder WORKDIR /repo COPY . . ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 -RUN bash -c "source deployment/common.build.sh && \ - build_jellyfin Jellyfin.Server Release linux-x64 /jellyfin" +RUN dotnet publish Jellyfin.Server --configuration Release --output="/jellyfin" --self-contained --runtime linux-x64 "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" FROM jellyfin/ffmpeg:${FFMPEG_VERSION} as ffmpeg FROM mcr.microsoft.com/dotnet/core/runtime:${DOTNET_VERSION} diff --git a/Dockerfile.arm b/Dockerfile.arm index 8a91d71be..742e050d5 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -22,8 +22,7 @@ RUN find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \; # Discard objs - may cause failures if exists RUN find . -type d -name obj | xargs -r rm -r # Build -RUN bash -c "source deployment/common.build.sh && \ - build_jellyfin Jellyfin.Server Release linux-arm /jellyfin" +RUN dotnet publish Jellyfin.Server --configuration Release --output="/jellyfin" --self-contained --runtime linux-arm "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" FROM multiarch/qemu-user-static:x86_64-arm as qemu diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index b24d5d599..8c0baf925 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -22,8 +22,7 @@ RUN find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \; # Discard objs - may cause failures if exists RUN find . -type d -name obj | xargs -r rm -r # Build -RUN bash -c "source deployment/common.build.sh && \ - build_jellyfin Jellyfin.Server Release linux-arm64 /jellyfin" +RUN dotnet publish Jellyfin.Server --configuration Release --output="/jellyfin" --self-contained --runtime linux-arm64 "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu |