From 75b7117f078461d2507572ba9da6527894e1b734 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 6 Jan 2022 10:37:49 +0100 Subject: Remove unnecessary NPM_RUN_BUILD_OPTS docker arg --- server/lib/live/shared/muxing-session.ts | 2 +- support/docker/production/Dockerfile.bullseye | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/server/lib/live/shared/muxing-session.ts b/server/lib/live/shared/muxing-session.ts index eccaefcfa..22a47942a 100644 --- a/server/lib/live/shared/muxing-session.ts +++ b/server/lib/live/shared/muxing-session.ts @@ -229,7 +229,7 @@ class MuxingSession extends EventEmitter { const playlistIdMatcher = /^([\d+])-/ - const addHandler = async segmentPath => { + const addHandler = async (segmentPath: string) => { logger.debug('Live add handler of %s.', segmentPath, this.lTags()) const playlistId = basename(segmentPath).match(playlistIdMatcher)[0] diff --git a/support/docker/production/Dockerfile.bullseye b/support/docker/production/Dockerfile.bullseye index eacf6aca1..ac97ddce3 100644 --- a/support/docker/production/Dockerfile.bullseye +++ b/support/docker/production/Dockerfile.bullseye @@ -1,10 +1,5 @@ FROM node:14-bullseye-slim -# Allow to pass extra options to the npm run build -# eg: --light --light-fr to not build all client languages -# (speed up build time if i18n is not required) -ARG NPM_RUN_BUILD_OPTS - # Install dependencies RUN apt update \ && apt install -y --no-install-recommends openssl ffmpeg python ca-certificates gnupg gosu build-essential curl \ @@ -22,7 +17,7 @@ WORKDIR /app USER peertube RUN yarn install --pure-lockfile --network-timeout 1200000 --network-concurrency 20 \ - && npm run build -- $NPM_RUN_BUILD_OPTS \ + && npm run build \ && rm -r ./node_modules ./client/node_modules ./client/.angular \ && yarn install --pure-lockfile --production --network-timeout 1200000 --network-concurrency 20 \ && yarn cache clean -- cgit v1.2.3