From 5a1971c2801d8d6fa5ddba052e52f0d4d465ae1c Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 19 Jun 2020 17:17:44 -0400 Subject: Add builder docker images --- deployment/Dockerfile.docker.amd64 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 deployment/Dockerfile.docker.amd64 (limited to 'deployment/Dockerfile.docker.amd64') diff --git a/deployment/Dockerfile.docker.amd64 b/deployment/Dockerfile.docker.amd64 new file mode 100644 index 000000000..133163148 --- /dev/null +++ b/deployment/Dockerfile.docker.amd64 @@ -0,0 +1,14 @@ +ARG DOTNET_VERSION=3.1 +ARG SOURCE_DIR=/src +ARG ARTIFACT_DIR=/jellyfin + +FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder + +WORKDIR ${SOURCE_DIR} +COPY . . + +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 + +# because of changes in docker and systemd we need to not build in parallel at the moment +# see https://success.docker.com/article/how-to-reserve-resource-temporarily-unavailable-errors-due-to-tasksmax-setting +RUN dotnet publish Jellyfin.Server --disable-parallel --configuration Release --output="${ARTIFACT_DIR}" --self-contained --runtime linux-x64 "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" -- cgit v1.2.3 From ddc7b399a65e8e0d3ae66c41343fada29ddab3f2 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 19 Jun 2020 17:41:20 -0400 Subject: Add mkdir of the SOURCE_DIR before setting WORKDIR --- deployment/Dockerfile.docker.amd64 | 2 ++ deployment/Dockerfile.docker.arm64 | 2 ++ deployment/Dockerfile.docker.armhf | 2 ++ 3 files changed, 6 insertions(+) (limited to 'deployment/Dockerfile.docker.amd64') diff --git a/deployment/Dockerfile.docker.amd64 b/deployment/Dockerfile.docker.amd64 index 133163148..68ba1e049 100644 --- a/deployment/Dockerfile.docker.amd64 +++ b/deployment/Dockerfile.docker.amd64 @@ -4,6 +4,8 @@ ARG ARTIFACT_DIR=/jellyfin FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder +RUN mkdir ${SOURCE_DIR} + WORKDIR ${SOURCE_DIR} COPY . . diff --git a/deployment/Dockerfile.docker.arm64 b/deployment/Dockerfile.docker.arm64 index c81c2955b..f5dd4a45a 100644 --- a/deployment/Dockerfile.docker.arm64 +++ b/deployment/Dockerfile.docker.arm64 @@ -4,6 +4,8 @@ ARG ARTIFACT_DIR=/jellyfin FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder +RUN mkdir ${SOURCE_DIR} + WORKDIR ${SOURCE_DIR} COPY . . diff --git a/deployment/Dockerfile.docker.armhf b/deployment/Dockerfile.docker.armhf index abf15d4e7..a20a853f6 100644 --- a/deployment/Dockerfile.docker.armhf +++ b/deployment/Dockerfile.docker.armhf @@ -4,6 +4,8 @@ ARG ARTIFACT_DIR=/jellyfin FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder +RUN mkdir ${SOURCE_DIR} + WORKDIR ${SOURCE_DIR} COPY . . -- cgit v1.2.3 From d8428b0a0ab72534943e2e8683492b2976845f20 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 19 Jun 2020 17:44:04 -0400 Subject: Move ARGs for directories to after import --- deployment/Dockerfile.docker.amd64 | 5 ++--- deployment/Dockerfile.docker.arm64 | 5 ++--- deployment/Dockerfile.docker.armhf | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) (limited to 'deployment/Dockerfile.docker.amd64') diff --git a/deployment/Dockerfile.docker.amd64 b/deployment/Dockerfile.docker.amd64 index 68ba1e049..ff0722e06 100644 --- a/deployment/Dockerfile.docker.amd64 +++ b/deployment/Dockerfile.docker.amd64 @@ -1,10 +1,9 @@ ARG DOTNET_VERSION=3.1 -ARG SOURCE_DIR=/src -ARG ARTIFACT_DIR=/jellyfin FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder -RUN mkdir ${SOURCE_DIR} +ARG SOURCE_DIR=/src +ARG ARTIFACT_DIR=/jellyfin WORKDIR ${SOURCE_DIR} COPY . . diff --git a/deployment/Dockerfile.docker.arm64 b/deployment/Dockerfile.docker.arm64 index f5dd4a45a..f1100f99e 100644 --- a/deployment/Dockerfile.docker.arm64 +++ b/deployment/Dockerfile.docker.arm64 @@ -1,10 +1,9 @@ ARG DOTNET_VERSION=3.1 -ARG SOURCE_DIR=/src -ARG ARTIFACT_DIR=/jellyfin FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder -RUN mkdir ${SOURCE_DIR} +ARG SOURCE_DIR=/src +ARG ARTIFACT_DIR=/jellyfin WORKDIR ${SOURCE_DIR} COPY . . diff --git a/deployment/Dockerfile.docker.armhf b/deployment/Dockerfile.docker.armhf index a20a853f6..f83a0307b 100644 --- a/deployment/Dockerfile.docker.armhf +++ b/deployment/Dockerfile.docker.armhf @@ -1,10 +1,9 @@ ARG DOTNET_VERSION=3.1 -ARG SOURCE_DIR=/src -ARG ARTIFACT_DIR=/jellyfin FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder -RUN mkdir ${SOURCE_DIR} +ARG SOURCE_DIR=/src +ARG ARTIFACT_DIR=/jellyfin WORKDIR ${SOURCE_DIR} COPY . . -- cgit v1.2.3 From 4bfb4c9095ef03ccfe9cfb1c795b4d23fd549a25 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 19 Jun 2020 17:46:58 -0400 Subject: Remove as builder element as well --- deployment/Dockerfile.docker.amd64 | 2 +- deployment/Dockerfile.docker.arm64 | 2 +- deployment/Dockerfile.docker.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'deployment/Dockerfile.docker.amd64') diff --git a/deployment/Dockerfile.docker.amd64 b/deployment/Dockerfile.docker.amd64 index ff0722e06..204ded3a4 100644 --- a/deployment/Dockerfile.docker.amd64 +++ b/deployment/Dockerfile.docker.amd64 @@ -1,6 +1,6 @@ ARG DOTNET_VERSION=3.1 -FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder +FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster ARG SOURCE_DIR=/src ARG ARTIFACT_DIR=/jellyfin diff --git a/deployment/Dockerfile.docker.arm64 b/deployment/Dockerfile.docker.arm64 index f1100f99e..eedbaac33 100644 --- a/deployment/Dockerfile.docker.arm64 +++ b/deployment/Dockerfile.docker.arm64 @@ -1,6 +1,6 @@ ARG DOTNET_VERSION=3.1 -FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder +FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster ARG SOURCE_DIR=/src ARG ARTIFACT_DIR=/jellyfin diff --git a/deployment/Dockerfile.docker.armhf b/deployment/Dockerfile.docker.armhf index f83a0307b..2a500246b 100644 --- a/deployment/Dockerfile.docker.armhf +++ b/deployment/Dockerfile.docker.armhf @@ -1,6 +1,6 @@ ARG DOTNET_VERSION=3.1 -FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder +FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster ARG SOURCE_DIR=/src ARG ARTIFACT_DIR=/jellyfin -- cgit v1.2.3