Browse Source

Merge pull request #196 from nvllsvm/simplify

Simplify
Andrew Rabert 6 years ago
parent
commit
346c807a71
2 changed files with 3 additions and 5 deletions
  1. 1 3
      Dockerfile
  2. 2 2
      debian/rules

+ 1 - 3
Dockerfile

@@ -3,11 +3,9 @@ ARG DOTNET_VERSION=2
 FROM microsoft/dotnet:${DOTNET_VERSION}-sdk as builder
 FROM microsoft/dotnet:${DOTNET_VERSION}-sdk as builder
 WORKDIR /repo
 WORKDIR /repo
 COPY . .
 COPY . .
-ARG CONFIGURATION=RELEASE
 RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \
 RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \
  && dotnet clean \
  && 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
 FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
 COPY --from=builder /jellyfin /jellyfin
 COPY --from=builder /jellyfin /jellyfin

+ 2 - 2
debian/rules

@@ -15,8 +15,8 @@ override_dh_auto_test:
 override_dh_clistrip:
 override_dh_clistrip:
 
 
 override_dh_auto_build:
 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:
 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'
 	rm -rf '$(CURDIR)/usr'