diff options
| -rw-r--r-- | .ci/azure-pipelines-main.yml | 2 | ||||
| -rw-r--r-- | .ci/azure-pipelines-windows.yml | 2 | ||||
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | Dockerfile.arm | 3 | ||||
| -rw-r--r-- | Dockerfile.arm64 | 3 |
5 files changed, 5 insertions, 8 deletions
diff --git a/.ci/azure-pipelines-main.yml b/.ci/azure-pipelines-main.yml index 5cda81bd5..09901b2a6 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:production + script: yarn install workingDirectory: $(Agent.TempDirectory)/jellyfin-web - task: CopyFiles@2 diff --git a/.ci/azure-pipelines-windows.yml b/.ci/azure-pipelines-windows.yml index f3e02f97f..32d1d1382 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:production + script: yarn install workingDirectory: $(Agent.TempDirectory)/jellyfin-web - task: CopyFiles@2 diff --git a/Dockerfile b/Dockerfile index 982bfc2cb..8fbfe9baf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,7 @@ ARG JELLYFIN_WEB_VERSION=master 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:production \ + && yarn install && mv dist /dist FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder diff --git a/Dockerfile.arm b/Dockerfile.arm index 65f7800cb..ae442bd5b 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -10,8 +10,7 @@ ARG JELLYFIN_WEB_VERSION=master 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:production \ + && yarn install && mv dist /dist diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index df909c772..bcdd90d6e 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -10,8 +10,7 @@ ARG JELLYFIN_WEB_VERSION=master 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:production \ + && yarn install && mv dist /dist |