Explorar o código

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.
Joshua M. Boniface %!s(int64=5) %!d(string=hai) anos
pai
achega
75b7c9ac36
Modificáronse 3 ficheiros con 3 adicións e 6 borrados
  1. 1 2
      Dockerfile
  2. 1 2
      Dockerfile.arm
  3. 1 2
      Dockerfile.arm64

+ 1 - 2
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}

+ 1 - 2
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

+ 1 - 2
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