aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Rabert <6550543+nvllsvm@users.noreply.github.com>2018-12-16 00:50:36 -0500
committerGitHub <noreply@github.com>2018-12-16 00:50:36 -0500
commit346c807a719424c0fa67a5b3a53cbec5a380a2af (patch)
tree9d5b18b767ffc14a974fd89b5ed896d90d49b011
parent336a4a2b8d728c32bd22404dfa16f1a80a3e9b15 (diff)
parentb369fbd05e6af85047ade5ba986c478a604c3463 (diff)
Merge pull request #196 from nvllsvm/simplify
Simplify
-rw-r--r--Dockerfile4
-rwxr-xr-xdebian/rules4
2 files changed, 3 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile
index 9c352ef8f..5147ffb9a 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
diff --git a/debian/rules b/debian/rules
index 0b790f2e4..6c915af6f 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'