From: Chocobozzz <me@florianbigard.com>
Date: Fri, 4 Mar 2022 15:49:20 +0000 (+0100)
Subject: Reuse latest dockerfile fixes
X-Git-Tag: v4.1.1~12
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=219e18c944e5bc0e9620af96bb54451fa86e39ad;hp=5cad2ca9db9b9d138f8a33058d10b94a9fd50c69;p=github%2FChocobozzz%2FPeerTube.git

Reuse latest dockerfile fixes
---

diff --git a/support/docker/production/Dockerfile.bullseye b/support/docker/production/Dockerfile.bullseye
index ac97ddce3..e55da3307 100644
--- a/support/docker/production/Dockerfile.bullseye
+++ b/support/docker/production/Dockerfile.bullseye
@@ -2,7 +2,7 @@ FROM node:14-bullseye-slim
 
 # Install dependencies
 RUN apt update \
- && apt install -y --no-install-recommends openssl ffmpeg python ca-certificates gnupg gosu build-essential curl \
+ && apt install -y --no-install-recommends openssl ffmpeg python3 ca-certificates gnupg gosu build-essential curl \
  && gosu nobody true \
  && rm /var/lib/apt/lists/* -fR
 
@@ -16,7 +16,9 @@ WORKDIR /app
 
 USER peertube
 
-RUN yarn install --pure-lockfile --network-timeout 1200000 --network-concurrency 20 \
+# Install manually client dependencies to apply our network timeout option
+RUN cd client && yarn install --pure-lockfile --network-timeout 1200000 && cd ../ \
+    && yarn install --pure-lockfile --network-timeout 1200000 \
     && npm run build \
     && rm -r ./node_modules ./client/node_modules ./client/.angular \
     && yarn install --pure-lockfile --production --network-timeout 1200000 --network-concurrency 20 \