From 6894602dab70f7b9072fff1fd6d18fd55d1421ec Mon Sep 17 00:00:00 2001 From: Mark Monteiro Date: Fri, 20 Mar 2020 11:36:21 +0100 Subject: [PATCH] Use 'yarn build:production' instead of 'yarn:build' everywhere --- .ci/azure-pipelines-main.yml | 2 +- .ci/azure-pipelines-windows.yml | 2 +- Dockerfile | 2 +- Dockerfile.arm | 2 +- Dockerfile.arm64 | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci/azure-pipelines-main.yml b/.ci/azure-pipelines-main.yml index e33ab72f25..5cda81bd5e 100644 --- a/.ci/azure-pipelines-main.yml +++ b/.ci/azure-pipelines-main.yml @@ -43,7 +43,7 @@ jobs: displayName: "Build Web Client" condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master'), contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')), eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest', 'IndividualCI', 'BatchedCI', 'BuildCompletion')) inputs: - script: yarn install && yarn build + script: yarn install && yarn build:production workingDirectory: $(Agent.TempDirectory)/jellyfin-web - task: CopyFiles@2 diff --git a/.ci/azure-pipelines-windows.yml b/.ci/azure-pipelines-windows.yml index 11856f9c82..f3e02f97fd 100644 --- a/.ci/azure-pipelines-windows.yml +++ b/.ci/azure-pipelines-windows.yml @@ -36,7 +36,7 @@ jobs: displayName: "Build Web Client" condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master'), contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')), in(variables['Build.Reason'], 'PullRequest', 'IndividualCI', 'BatchedCI', 'BuildCompletion')) inputs: - script: yarn install && yarn build + script: yarn install && yarn build:production workingDirectory: $(Agent.TempDirectory)/jellyfin-web - task: CopyFiles@2 diff --git a/Dockerfile b/Dockerfile index 73ab3d7904..982bfc2cb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN apk add curl git \ && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \ && cd jellyfin-web-* \ && yarn install \ - && yarn build \ + && yarn build:production \ && mv dist /dist FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder diff --git a/Dockerfile.arm b/Dockerfile.arm index 07780e27bf..65f7800cb5 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -11,7 +11,7 @@ RUN apk add curl git \ && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \ && cd jellyfin-web-* \ && yarn install \ - && yarn build \ + && yarn build:production \ && mv dist /dist diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 9dc6fa7edb..df909c7722 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -11,7 +11,7 @@ RUN apk add curl git \ && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \ && cd jellyfin-web-* \ && yarn install \ - && yarn build \ + && yarn build:production \ && mv dist /dist @@ -35,7 +35,7 @@ ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin -RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ +RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ ffmpeg \ libssl-dev \ ca-certificates \