diff options
author | Chocobozzz <me@florianbigard.com> | 2022-01-06 10:37:49 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-01-06 10:37:55 +0100 |
commit | 75b7117f078461d2507572ba9da6527894e1b734 (patch) | |
tree | cbf0882c7a525717552fe0033f8b60ed244e82bd | |
parent | f8360396ffabd2f95e9ece9c5755173bae0114b6 (diff) | |
download | PeerTube-75b7117f078461d2507572ba9da6527894e1b734.tar.gz PeerTube-75b7117f078461d2507572ba9da6527894e1b734.tar.zst PeerTube-75b7117f078461d2507572ba9da6527894e1b734.zip |
Remove unnecessary NPM_RUN_BUILD_OPTS docker arg
-rw-r--r-- | server/lib/live/shared/muxing-session.ts | 2 | ||||
-rw-r--r-- | 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 { | |||
229 | 229 | ||
230 | const playlistIdMatcher = /^([\d+])-/ | 230 | const playlistIdMatcher = /^([\d+])-/ |
231 | 231 | ||
232 | const addHandler = async segmentPath => { | 232 | const addHandler = async (segmentPath: string) => { |
233 | logger.debug('Live add handler of %s.', segmentPath, this.lTags()) | 233 | logger.debug('Live add handler of %s.', segmentPath, this.lTags()) |
234 | 234 | ||
235 | const playlistId = basename(segmentPath).match(playlistIdMatcher)[0] | 235 | 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 @@ | |||
1 | FROM node:14-bullseye-slim | 1 | FROM node:14-bullseye-slim |
2 | 2 | ||
3 | # Allow to pass extra options to the npm run build | ||
4 | # eg: --light --light-fr to not build all client languages | ||
5 | # (speed up build time if i18n is not required) | ||
6 | ARG NPM_RUN_BUILD_OPTS | ||
7 | |||
8 | # Install dependencies | 3 | # Install dependencies |
9 | RUN apt update \ | 4 | RUN apt update \ |
10 | && apt install -y --no-install-recommends openssl ffmpeg python ca-certificates gnupg gosu build-essential curl \ | 5 | && apt install -y --no-install-recommends openssl ffmpeg python ca-certificates gnupg gosu build-essential curl \ |
@@ -22,7 +17,7 @@ WORKDIR /app | |||
22 | USER peertube | 17 | USER peertube |
23 | 18 | ||
24 | RUN yarn install --pure-lockfile --network-timeout 1200000 --network-concurrency 20 \ | 19 | RUN yarn install --pure-lockfile --network-timeout 1200000 --network-concurrency 20 \ |
25 | && npm run build -- $NPM_RUN_BUILD_OPTS \ | 20 | && npm run build \ |
26 | && rm -r ./node_modules ./client/node_modules ./client/.angular \ | 21 | && rm -r ./node_modules ./client/node_modules ./client/.angular \ |
27 | && yarn install --pure-lockfile --production --network-timeout 1200000 --network-concurrency 20 \ | 22 | && yarn install --pure-lockfile --production --network-timeout 1200000 --network-concurrency 20 \ |
28 | && yarn cache clean | 23 | && yarn cache clean |