From 23ed559bb08439f79f4e7b8217385bcee3b4e7fa Mon Sep 17 00:00:00 2001 From: Andrew Rabert Date: Sun, 16 Dec 2018 00:40:07 -0500 Subject: [PATCH 1/2] Simplify Docker build - Remove unnecessary build command (implied in publish) - Remove unnecessary solution arg - Move arg to command --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9c352ef8f3..5147ffb9af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,9 @@ ARG DOTNET_VERSION=2 FROM microsoft/dotnet:${DOTNET_VERSION}-sdk as builder WORKDIR /repo COPY . . -ARG CONFIGURATION=RELEASE RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \ && dotnet clean \ - && dotnet build --configuration ${CONFIGURATION} $(pwd)/MediaBrowser.sln \ - && dotnet publish --configuration ${CONFIGURATION} $(pwd)/MediaBrowser.sln --output /jellyfin + && dotnet publish --configuration release --output /jellyfin FROM microsoft/dotnet:${DOTNET_VERSION}-runtime COPY --from=builder /jellyfin /jellyfin From b369fbd05e6af85047ade5ba986c478a604c3463 Mon Sep 17 00:00:00 2001 From: Andrew Rabert Date: Sun, 16 Dec 2018 00:43:38 -0500 Subject: [PATCH 2/2] Remove redundant solution specification --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 0b790f2e45..6c915af6f4 100755 --- a/debian/rules +++ b/debian/rules @@ -15,8 +15,8 @@ override_dh_auto_test: override_dh_clistrip: override_dh_auto_build: - dotnet publish --configuration $(CONFIG) $(CURDIR)/MediaBrowser.sln --output='$(CURDIR)/usr/lib/jellyfin/bin' --self-contained --runtime linux-x64 + dotnet publish --configuration $(CONFIG) --output='$(CURDIR)/usr/lib/jellyfin/bin' --self-contained --runtime linux-x64 override_dh_auto_clean: - dotnet clean -maxcpucount:1 --configuration $(CONFIG) $(CURDIR)/MediaBrowser.sln || true + dotnet clean -maxcpucount:1 --configuration $(CONFIG) || true rm -rf '$(CURDIR)/usr'