9 files changed, 317 insertions, 116 deletions

diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index cfba7b361..5746d3a47 100644
--- a/support/doc/api/openapi.yaml
+++ b/support/doc/api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
   title: PeerTube
-  version: 3.3.0
+  version: 4.0.0
   contact:
     name: PeerTube Community
     url: https://joinpeertube.org
@@ -3792,6 +3792,39 @@ paths:
         '500':
           description: search index unavailable
 
+  /blocklist/status:
+    get:
+      tags:
+        - Account Blocks
+        - Server Blocks
+      summary: Get block status of accounts/hosts
+      parameters:
+        -
+          name: 'accounts'
+          in: query
+          description: 'Check if these accounts are blocked'
+          example: [ 'goofy@example.com', 'donald@example.com' ]
+          schema:
+            type: array
+            items:
+              type: string
+        -
+          name: 'hosts'
+          in: query
+          description: 'Check if these hosts are blocked'
+          example: [ 'example.com' ]
+          schema:
+            type: array
+            items:
+              type: string
+      responses:
+        '200':
+          description: successful operation
+          content:
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/BlockStatus'
+
   /server/blocklist/accounts:
     get:
       tags:
@@ -5134,6 +5167,29 @@ components:
         label:
           type: string
 
+    BlockStatus:
+      properties:
+        accounts:
+          type: object
+          additionalProperties:
+            x-additionalPropertiesName: account
+            type: object
+            properties:
+              blockedByServer:
+                type: boolean
+              blockedByUser:
+                type: boolean
+        hosts:
+          type: object
+          additionalProperties:
+            x-additionalPropertiesName: host
+            type: object
+            properties:
+              blockedByServer:
+                type: boolean
+              blockedByUser:
+                type: boolean
+
     NSFWPolicy:
       type: string
       enum:
@@ -6623,7 +6679,7 @@ components:
           type: integer
           description: The user daily video quota in bytes
           example: -1
-        webtorrentEnabled:
+        p2pEnabled:
           type: boolean
           description: Enable P2P in the player
     UserWithStats:
@@ -6701,6 +6757,8 @@ components:
           $ref: '#/components/schemas/UserRole'
         adminFlags:
           $ref: '#/components/schemas/UserAdminFlags'
+        password:
+          $ref: '#/components/schemas/password'
     UpdateMe:
       # see shared/models/users/user-update-me.model.ts:
       properties:
@@ -6724,7 +6782,7 @@ components:
             - 'true'
             - 'false'
             - both
-        webTorrentEnabled:
+        p2pEnabled:
           type: boolean
           description: whether to enable P2P in the player or not
         autoPlayVideo:
@@ -7172,6 +7230,14 @@ components:
             - `13` NEW_INSTANCE_FOLLOWER
 
             - `14` AUTO_INSTANCE_FOLLOWING
+
+            - `15` ABUSE_STATE_CHANGE
+
+            - `16` ABUSE_NEW_MESSAGE
+
+            - `17` NEW_PLUGIN_VERSION
+
+            - `18` NEW_PEERTUBE_VERSION
         read:
           type: boolean
         video:
diff --git a/support/doc/dependencies.md b/support/doc/dependencies.md
index 711fd2d7f..61b0fc6bc 100644
--- a/support/doc/dependencies.md
+++ b/support/doc/dependencies.md
@@ -77,7 +77,7 @@ sudo systemctl start redis postgresql
 1. Run:
 
 ```
-sudo pacman -S nodejs-lts-fermium  yarn ffmpeg postgresql openssl redis git wget unzip python base-devel npm nginx
+sudo pacman -S nodejs-lts-fermium yarn ffmpeg postgresql openssl redis git wget unzip python base-devel npm nginx
 ```
 
 Now that dependencies are installed, before running PeerTube you should start PostgreSQL and Redis:
@@ -88,7 +88,7 @@ sudo systemctl start redis postgresql
 
 ## CentOS 7
 
-1. Install NodeJS 12.x:
+1. Install NodeJS 14.x:
 [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora)
 
 2. Install yarn:
@@ -135,7 +135,7 @@ sudo systemctl enable --now postgresql
 
 ## Centos 8
 
-1. Install NodeJS 12.x:
+1. Install NodeJS 14.x:
 [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora)
 
 2. Install yarn:
@@ -180,9 +180,9 @@ sudo systemctl enable --now postgresql
 sudo dnf update -y
 ```
 
-2. Install NodeJS 12.x (or 14):
+2. Install NodeJS 14.x:
 ```
-sudo dnf module install -y nodejs:12
+sudo dnf module install -y nodejs:14
 ```
 
 3. Install yarn:
@@ -239,7 +239,7 @@ su my-peertube-user
 3. (Optional) Install certbot (choose instructions for your distribution):
 [https://certbot.eff.org/all-instructions](https://certbot.eff.org/all-instructions)
 
-4. Install NodeJS 12.x:
+4. Install NodeJS 14.x:
 [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora)
 
 5. Install yarn:
@@ -331,7 +331,7 @@ echo fs.inotify.max_user_watches=582222 | sudo tee -a /etc/sysctl.conf && sudo s
 2. Install Node.JS
 
 ```
-sudo dnf module install nodejs:12
+sudo dnf module install nodejs:14
 ```
 
 3. Install Yarn
diff --git a/support/doc/development/ci.md b/support/doc/development/ci.md
new file mode 100644
index 000000000..7d6eef197
--- /dev/null
+++ b/support/doc/development/ci.md
@@ -0,0 +1,40 @@
+# Continuous integration
+
+PeerTube uses Github Actions as a CI platform.
+CI tasks are described in `.github/workflows`.
+
+## benchmark.yml
+
+*Scheduled*
+
+Run various benchmarks (build, API etc) and upload results on https://builds.joinpeertube.org/peertube-stats/ to be publicly consumed.
+
+## codeql.yml
+
+*Scheduled, on push on develop and on pull request*
+
+Run CodeQL task to throw code security issues in Github. https://lgtm.com/projects/g/Chocobozzz/PeerTube can also be used.
+
+## docker.yml
+
+*Scheduled and on push on master*
+
+Build `chocobozzz/peertube-webserver:latest`, `chocobozzz/peertube:production-...`, `chocobozzz/peertube:v-...` (only latest PeerTube tag) and `chocobozzz/peertube:develop-...` Docker images. Scheduled to automatically upgrade image software (Debian security issues etc).
+
+## nightly.yml
+
+*Scheduled*
+
+Build PeerTube nightly build (`develop` branch) and upload the release on https://builds.joinpeertube.org/nightly.
+
+## stats.yml
+
+*On push on develop*
+
+Create various PeerTube stats (line of codes, build size, lighthouse report) and upload results on https://builds.joinpeertube.org/peertube-stats/ to be publicly consumed.
+
+## test.yml
+
+*Scheduled, on push and pull request*
+
+Run PeerTube lint and tests.
diff --git a/support/doc/development/lib.md b/support/doc/development/lib.md
index 6b0372150..c43edbacc 100644
--- a/support/doc/development/lib.md
+++ b/support/doc/development/lib.md
@@ -2,9 +2,24 @@
 
 ## @peertube/embed-api
 
-### Build
+### Build & Publish
 
 ```
 $ cd client/src/standalone/player/
 $ npm run build
+$ npm publish --access=public
 ```
+
+## @peertube/peertube-types
+
+Typescript definition files generation is controlled by the various `tsconfig.types.json` files.
+
+The complete types package is generated via:
+
+```
+$ npm run generate-types-package 4.x.x
+$ cd packages/types/dist
+$ npm publish --access=public
+```
+
+> See [scripts/generate-types-package.ts](scripts/generate-types-package.ts) for details.
diff --git a/support/doc/development/release.md b/support/doc/development/release.md
index a9a3ca452..d62969cf2 100644
--- a/support/doc/development/release.md
+++ b/support/doc/development/release.md
@@ -15,6 +15,7 @@ NODE_APP_INSTANCE=6 NODE_ENV=test node dist/server --benchmark-startup
  * Check CI tests are green
  * Run BrowserStack **and** local E2E tests
  * Release: `GITHUB_TOKEN=my_token npm run release -- 1.x.x`
+ * Upload `tar.xz` on https://builds.joinpeertube.org/release
  * Create a dedicated branch: `git checkout -b release/1.x.x && git push origin release/1.x.x`
  * Check the release is okay: https://github.com/Chocobozzz/PeerTube/releases
  * Update https://peertube3.cpy.re and check it works correctly
diff --git a/support/doc/development/tests.md b/support/doc/development/tests.md
index d0e88a5eb..02fc41147 100644
--- a/support/doc/development/tests.md
+++ b/support/doc/development/tests.md
@@ -42,7 +42,7 @@ $ npm run test # See scripts/test.sh to run a particular suite
 Most of tests can be runned using:
 
 ```bash
-TS_NODE_TRANSPILE_ONLY=true mocha -- --timeout 30000 --exit -r ts-node/register -r tsconfig-paths/register --bail server/tests/api/videos/video-transcoder.ts
+TS_NODE_TRANSPILE_ONLY=true npm run mocha -- --timeout 30000 --exit -r ts-node/register -r tsconfig-paths/register --bail server/tests/api/videos/video-transcoder.ts
 ```
 
 `server/tests/api/activitypub` tests will need different options:
@@ -88,13 +88,7 @@ $ BROWSERSTACK_USER=your_user BROWSERSTACK_KEY=your_key npm run e2e:browserstack
 
 ### Add E2E tests
 
-To add E2E tests and quickly run tests using a local Chrome, first create a test instance:
-
-```bash
-$ npm run clean:server:test && NODE_APP_INSTANCE=1 NODE_ENV=test npm start
-```
-
-Then, just run your suite using:
+To add E2E tests and quickly run tests using a local Chrome:
 
 ```bash
 $ cd client/e2e
diff --git a/support/doc/plugins/guide.md b/support/doc/plugins/guide.md
index 3785246a7..52e3b6052 100644
--- a/support/doc/plugins/guide.md
+++ b/support/doc/plugins/guide.md
@@ -16,11 +16,10 @@
     - [Add new transcoding profiles](#add-new-transcoding-profiles)
     - [Server helpers](#server-helpers)
   - [Client API (themes & plugins)](#client-api-themes--plugins)
-    - [Plugin static route](#plugin-static-route)
+    - [Get plugin static and router routes](#get-plugin-static-and-router-routes)
     - [Notifier](#notifier)
     - [Markdown Renderer](#markdown-renderer)
     - [Auth header](#auth-header)
-    - [Plugin router route](#plugin-router-route)
     - [Custom Modal](#custom-modal)
     - [Translate](#translate)
     - [Get public settings](#get-public-settings)
@@ -30,6 +29,7 @@
     - [Plugin selector on HTML elements](#plugin-selector-on-html-elements)
     - [HTML placeholder elements](#html-placeholder-elements)
     - [Add/remove left menu links](#addremove-left-menu-links)
+    - [Create client page](#create-client-page)
   - [Publishing](#publishing)
 - [Write a plugin/theme](#write-a-plugintheme)
   - [Clone the quickstart repository](#clone-the-quickstart-repository)
@@ -531,7 +531,7 @@ See the [plugin API reference](https://docs.joinpeertube.org/api-plugins) to see
 
 ### Client API (themes & plugins)
 
-#### Plugin static route
+#### Get plugin static and router routes
 
 To get your plugin static route:
 
@@ -542,6 +542,24 @@ function register (...) {
 }
 ```
 
+And to get your plugin router route, use `peertubeHelpers.getBaseRouterRoute()`:
+
+```js
+function register (...) {
+  registerHook({
+    target: 'action:video-watch.video.loaded',
+    handler: ({ video }) => {
+      fetch(peertubeHelpers.getBaseRouterRoute() + '/my/plugin/api', {
+        method: 'GET',
+        headers: peertubeHelpers.getAuthHeader()
+      }).then(res => res.json())
+        .then(data => console.log('Hi %s.', data))
+    }
+  })
+}
+```
+
+
 #### Notifier
 
 To notify the user with the PeerTube ToastModule:
@@ -594,27 +612,6 @@ function register (...) {
 }
 ```
 
-#### Plugin router route
-
-**PeerTube >= 3.3**
-
-To get your plugin router route, you can use `peertubeHelpers.getBaseRouterRoute()`:
-
-```js
-function register (...) {
-  registerHook({
-    target: 'action:video-watch.video.loaded',
-    handler: ({ video }) => {
-      fetch(peertubeHelpers.getBaseRouterRoute() + '/my/plugin/api', {
-        method: 'GET',
-        headers: peertubeHelpers.getAuthHeader()
-      }).then(res => res.json())
-        .then(data => console.log('Hi %s.', data))
-    }
-  })
-}
-```
-
 #### Custom Modal
 
 To show a custom modal:
@@ -686,18 +683,37 @@ async function register ({ registerVideoField, peertubeHelpers }) {
     name: 'my-field-name,
     label: 'My added field',
     descriptionHTML: 'Optional description',
+
+    // type: 'input' | 'input-checkbox' | 'input-password' | 'input-textarea' | 'markdown-text' | 'markdown-enhanced' | 'select' | 'html'
+    // /!\ 'input-checkbox' could send "false" and "true" strings instead of boolean
     type: 'input-textarea',
+
     default: '',
+
     // Optional, to hide a field depending on the current form state
     // liveVideo is in the options object when the user is creating/updating a live
     // videoToUpdate is in the options object when the user is updating a video
     hidden: ({ formValues, videoToUpdate, liveVideo }) => {
       return formValues.pluginData['other-field'] === 'toto'
+    },
+
+    // Optional, to display an error depending on the form state
+    error: ({ formValues, value }) => {
+      if (formValues['privacy'] !== 1 && formValues['privacy'] !== 2) return { error: false }
+      if (value === true) return { error: false }
+
+      return { error: true, text: 'Should be enabled' }
     }
   }
 
+  const videoFormOptions = {
+    // Optional, to choose to put your setting in a specific tab in video form
+    // type: 'main' | 'plugin-settings'
+    tab: 'main'
+  }
+
   for (const type of [ 'upload', 'import-url', 'import-torrent', 'update', 'go-live' ]) {
-    registerVideoField(commonOptions, { type })
+    registerVideoField(commonOptions, { type, ...videoFormOptions  })
   }
 }
 ```
@@ -787,6 +803,21 @@ See the complete list on https://docs.joinpeertube.org/api-plugins
 
 Left menu links can be filtered (add/remove a section or add/remove links) using the `filter:left-menu.links.create.result` client hook.
 
+#### Create client page
+
+To create a client page, register a new client route:
+
+```js
+function register ({ registerClientRoute }) {
+  registerClientRoute({
+    route: 'my-super/route',
+    onMount: ({ rootEl }) => {
+      rootEl.innerHTML = 'hello'
+    }
+  })
+}
+```
+
 
 ### Publishing
 
@@ -875,11 +906,62 @@ And if you don't need CSS or client script files, use an empty `array`:
 ### Write code
 
 Now you can register hooks or settings, write CSS and add static directories to your plugin or your theme :)
+It's up to you to check the code you write will be compatible with the PeerTube NodeJS version, and will be supported by web browsers.
+
+**JavaScript**
 
-**Caution:** It's up to you to check the code you write will be compatible with the PeerTube NodeJS version,
-and will be supported by web browsers.
 If you want to write modern JavaScript, please use a transpiler like [Babel](https://babeljs.io/).
 
+**Typescript**
+
+If you want to use __Typescript__, you can add __PeerTube__ types as dev dependencies:
+
+```
+npm install --save-dev @peertube/peertube-types
+```
+
+This package exposes *server* definition files by default:
+```ts
+import { RegisterServerOptions } from '@peertube/peertube-types'
+
+export async function register ({ registerHook }: RegisterServerOptions) {
+  registerHook({
+    target: 'action:application.listening',
+    handler: () => displayHelloWorld()
+  })
+}
+```
+
+But it also exposes client types and various models used in __PeerTube__:
+```ts
+import { Video } from '@peertube/peertube-types';
+import { RegisterClientOptions } from '@peertube/peertube-types/client';
+
+function register({ registerHook, peertubeHelpers }: RegisterClientOptions) {
+  registerHook({
+    target: 'action:admin-plugin-settings.init',
+    handler: ({ npmName }: { npmName: string }) => {
+      if ('peertube-plugin-transcription' !== npmName) {
+        return;
+      }
+    },
+  });
+
+  registerHook({
+    target: 'action:video-watch.video.loaded',
+    handler: ({ video }: { video: Video }) => {
+      fetch(`${peertubeHelpers.getBaseRouterRoute()}/videos/${video.uuid}/captions`, {
+        method: 'PUT',
+        headers: peertubeHelpers.getAuthHeader(),
+      }).then((res) => res.json())
+        .then((data) => console.log('Hi %s.', data));
+    },
+  });
+}
+
+export { register };
+```
+
 ### Add translations
 
 If you want to translate strings of your plugin (like labels of your registered settings), create a file and add it to `package.json`:
diff --git a/support/doc/production.md b/support/doc/production.md
index 790e43f31..48ecf1517 100644
--- a/support/doc/production.md
+++ b/support/doc/production.md
@@ -8,36 +8,36 @@
 Please don't install PeerTube for production on a device behind a low bandwidth connection (example: your ADSL link).
 If you want information about the appropriate hardware to run PeerTube, please see the [FAQ](https://joinpeertube.org/en_US/faq#should-i-have-a-big-server-to-run-peertube).
 
-### Dependencies
+### :hammer: Dependencies
 
-**Follow the steps of the [dependencies guide](dependencies.md).**
+Follow the steps of the [dependencies guide](dependencies.md).
 
-### PeerTube user
+### :construction_worker: PeerTube user
 
 Create a `peertube` user with `/var/www/peertube` home:
 
-```
+```bash
 $ sudo useradd -m -d /var/www/peertube -s /bin/bash -p peertube peertube
 ```
 
 Set its password:
-```
+```bash
 $ sudo passwd peertube
 ```
 
 **On FreeBSD**
 
-```
+```bash
 $ sudo pw useradd -n peertube -d /var/www/peertube -s /usr/local/bin/bash -m
 $ sudo passwd peertube
 ```
 or use `adduser` to create it interactively.
 
-### Database
+### :card_file_box: Database
 
 Create the production database and a peertube user inside PostgreSQL:
 
-```
+```bash
 $ cd /var/www/peertube
 $ sudo -u postgres createuser -P peertube
 ```
@@ -45,58 +45,66 @@ $ sudo -u postgres createuser -P peertube
 Here you should enter a password for PostgreSQL `peertube` user, that should be copied in `production.yaml` file.
 Don't just hit enter else it will be empty.
 
-```
+```bash
 $ sudo -u postgres createdb -O peertube -E UTF8 -T template0 peertube_prod
 ```
 
 Then enable extensions PeerTube needs:
 
-```
+```bash
 $ sudo -u postgres psql -c "CREATE EXTENSION pg_trgm;" peertube_prod
 $ sudo -u postgres psql -c "CREATE EXTENSION unaccent;" peertube_prod
 ```
 
-### Prepare PeerTube directory
+### :page_facing_up: Prepare PeerTube directory
 
-Fetch the latest tagged version of Peertube
-```
+Fetch the latest tagged version of Peertube:
+
+```bash
 $ VERSION=$(curl -s https://api.github.com/repos/chocobozzz/peertube/releases/latest | grep tag_name | cut -d '"' -f 4) && echo "Latest Peertube version is $VERSION"
 ```
 
-Open the peertube directory, create a few required directories
-```
+
+Open the peertube directory, create a few required directories:
+
+```bash
 $ cd /var/www/peertube
 $ sudo -u peertube mkdir config storage versions
 $ sudo -u peertube chmod 750 config/
 ```
 
-Download the latest version of the Peertube client, unzip it and remove the zip
-```
+
+Download the latest version of the Peertube client, unzip it and remove the zip:
+
+```bash
 $ cd /var/www/peertube/versions
+$ # Releases are also available on https://builds.joinpeertube.org/release
 $ sudo -u peertube wget -q "https://github.com/Chocobozzz/PeerTube/releases/download/${VERSION}/peertube-${VERSION}.zip"
 $ sudo -u peertube unzip -q peertube-${VERSION}.zip && sudo -u peertube rm peertube-${VERSION}.zip
 ```
 
+
 Install Peertube:
-```
+
+```bash
 $ cd /var/www/peertube
 $ sudo -u peertube ln -s versions/peertube-${VERSION} ./peertube-latest
 $ cd ./peertube-latest && sudo -H -u peertube yarn install --production --pure-lockfile
 ```
 
-### PeerTube configuration
+### :wrench: PeerTube configuration
 
 Copy the default configuration file that contains the default configuration provided by PeerTube.
 You **must not** update this file.
 
-```
+```bash
 $ cd /var/www/peertube
 $ sudo -u peertube cp peertube-latest/config/default.yaml config/default.yaml
 ```
 
 Now copy the production example configuration:
 
-```
+```bash
 $ cd /var/www/peertube
 $ sudo -u peertube cp peertube-latest/config/production.yaml.example config/production.yaml
 ```
@@ -107,20 +115,20 @@ Keys defined in `config/production.yaml` will override keys defined in `config/d
 
 **PeerTube does not support webserver host change**. Even though [PeerTube CLI can help you to switch hostname](https://docs.joinpeertube.org/maintain-tools?id=update-hostjs) there's no official support for that since it is a risky operation that might result in unforeseen errors.
 
-### Webserver
+### :truck: Webserver
 
 We only provide official configuration files for Nginx.
 
 Copy the nginx configuration template:
 
-```
+```bash
 $ sudo cp /var/www/peertube/peertube-latest/support/nginx/peertube /etc/nginx/sites-available/peertube
 ```
 
 Then set the domain for the webserver configuration file.
 Replace `[peertube-domain]` with the domain for the peertube server.
 
-```
+```bash
 $ sudo sed -i 's/${WEBSERVER_HOST}/[peertube-domain]/g' /etc/nginx/sites-available/peertube
 $ sudo sed -i 's/${PEERTUBE_HOST}/127.0.0.1:9000/g' /etc/nginx/sites-available/peertube
 ```
@@ -128,19 +136,19 @@ $ sudo sed -i 's/${PEERTUBE_HOST}/127.0.0.1:9000/g' /etc/nginx/sites-available/p
 Then modify the webserver configuration file. Please pay attention to the `alias` keys of the static locations.
 It should correspond to the paths of your storage directories (set in the configuration file inside the `storage` key).
 
-```
+```bash
 $ sudo vim /etc/nginx/sites-available/peertube
 ```
 
 Activate the configuration file:
 
-```
+```bash
 $ sudo ln -s /etc/nginx/sites-available/peertube /etc/nginx/sites-enabled/peertube
 ```
 
 To generate the certificate for your domain as required to make https work you can use [Let's Encrypt](https://letsencrypt.org/):
 
-```
+```bash
 $ sudo systemctl stop nginx
 $ sudo certbot certonly --standalone --post-hook "systemctl restart nginx"
 $ sudo systemctl reload nginx
@@ -148,14 +156,14 @@ $ sudo systemctl reload nginx
 
 Now you have the certificates you can reload nginx:
 
-```
+```bash
 $ sudo systemctl reload nginx
 ```
 
 Certbot should have installed a cron to automatically renew your certificate.
 Since our nginx template supports webroot renewal, we suggest you to update the renewal config file to use the `webroot` authenticator:
 
-```
+```bash
 $ # Replace authenticator = standalone by authenticator = webroot
 $ # Add webroot_path = /var/www/certbot
 $ sudo vim /etc/letsencrypt/renewal/your-domain.com.conf
@@ -164,15 +172,15 @@ $ sudo vim /etc/letsencrypt/renewal/your-domain.com.conf
 **FreeBSD**
 On FreeBSD you can use [Dehydrated](https://dehydrated.io/) `security/dehydrated` for [Let's Encrypt](https://letsencrypt.org/)
 
-```
+```bash
 $ sudo pkg install dehydrated
 ```
 
-### TCP/IP Tuning
+### :alembic: TCP/IP Tuning
 
 **On Linux**
 
-```
+```bash
 $ sudo cp /var/www/peertube/peertube-latest/support/sysctl.d/30-peertube-tcp.conf /etc/sysctl.d/
 $ sudo sysctl -p /etc/sysctl.d/30-peertube-tcp.conf
 ```
@@ -181,36 +189,36 @@ Your distro may enable this by default, but at least Debian 9 does not, and the
 scheduler is quite prone to "Buffer Bloat" and extreme latency when dealing with slower client
 links as we often encounter in a video server.
 
-### systemd
+### :bricks: systemd
 
 If your OS uses systemd, copy the configuration template:
 
-```
+```bash
 $ sudo cp /var/www/peertube/peertube-latest/support/systemd/peertube.service /etc/systemd/system/
 ```
 
 Check the service file (PeerTube paths and security directives):
 
-```
+```bash
 $ sudo vim /etc/systemd/system/peertube.service
 ```
 
 
 Tell systemd to reload its config:
 
-```
+```bash
 $ sudo systemctl daemon-reload
 ```
 
 If you want to start PeerTube on boot:
 
-```
+```bash
 $ sudo systemctl enable peertube
 ```
 
 Run:
 
-```
+```bash
 $ sudo systemctl start peertube
 $ sudo journalctl -feu peertube
 ```
@@ -218,51 +226,51 @@ $ sudo journalctl -feu peertube
 **FreeBSD**
 On FreeBSD, copy the startup script and update rc.conf:
 
-```
+```bash
 $ sudo install -m 0555 /var/www/peertube/peertube-latest/support/freebsd/peertube /usr/local/etc/rc.d/
 $ sudo sysrc peertube_enable="YES"
 ```
 
 Run:
 
-```
+```bash
 $ sudo service peertube start
 ```
 
-### OpenRC
+### :bricks: OpenRC
 
 If your OS uses OpenRC, copy the service script:
 
-```
+```bash
 $ sudo cp /var/www/peertube/peertube-latest/support/init.d/peertube /etc/init.d/
 ```
 
 If you want to start PeerTube on boot:
 
-```
+```bash
 $ sudo rc-update add peertube default
 ```
 
 Run and print last logs:
 
-```
+```bash
 $ sudo /etc/init.d/peertube start
 $ tail -f /var/log/peertube/peertube.log
 ```
 
-### Administrator
+### :technologist: Administrator
 
 The administrator password is automatically generated and can be found in the PeerTube
 logs (path defined in `production.yaml`). You can also set another password with:
 
-```
+```bash
 $ cd /var/www/peertube/peertube-latest && NODE_CONFIG_DIR=/var/www/peertube/config NODE_ENV=production npm run reset-password -- -u root
 ```
 
 Alternatively you can set the environment variable `PT_INITIAL_ROOT_PASSWORD`,
 to your own administrator password, although it must be 6 characters or more.
 
-### What now?
+### :tada: What now?
 
 Now your instance is up you can:
 
@@ -279,7 +287,7 @@ Now your instance is up you can:
 
 The password it asks is PeerTube's database user password.
 
-```
+```bash
 $ cd /var/www/peertube/peertube-latest/scripts && sudo -H -u peertube ./upgrade.sh
 $ sudo systemctl restart peertube # Or use your OS command to restart PeerTube if you don't use systemd
 ```
@@ -288,7 +296,7 @@ $ sudo systemctl restart peertube # Or use your OS command to restart PeerTube i
 
 Make a SQL backup
 
-```
+```bash
 $ SQL_BACKUP_PATH="backup/sql-peertube_prod-$(date -Im).bak" && \
     cd /var/www/peertube && sudo -u peertube mkdir -p backup && \
     sudo -u postgres pg_dump -F c peertube_prod | sudo -u peertube tee "$SQL_BACKUP_PATH" >/dev/null
@@ -296,13 +304,13 @@ $ SQL_BACKUP_PATH="backup/sql-peertube_prod-$(date -Im).bak" && \
 
 Fetch the latest tagged version of Peertube:
 
-```
+```bash
 $ VERSION=$(curl -s https://api.github.com/repos/chocobozzz/peertube/releases/latest | grep tag_name | cut -d '"' -f 4) && echo "Latest Peertube version is $VERSION"
 ```
 
 Download the new version and unzip it:
 
-```
+```bash
 $ cd /var/www/peertube/versions && \
     sudo -u peertube wget -q "https://github.com/Chocobozzz/PeerTube/releases/download/${VERSION}/peertube-${VERSION}.zip" && \
     sudo -u peertube unzip -o peertube-${VERSION}.zip && \
@@ -311,21 +319,21 @@ $ cd /var/www/peertube/versions && \
 
 Install node dependencies:
 
-```
+```bash
 $ cd /var/www/peertube/versions/peertube-${VERSION} && \
     sudo -H -u peertube yarn install --production --pure-lockfile
 ```
 
 Copy new configuration defaults values and update your configuration file:
 
-```
+```bash
 $ sudo -u peertube cp /var/www/peertube/versions/peertube-${VERSION}/config/default.yaml /var/www/peertube/config/default.yaml
 $ diff /var/www/peertube/versions/peertube-${VERSION}/config/production.yaml.example /var/www/peertube/config/production.yaml
 ```
 
 Change the link to point to the latest version:
 
-```
+```bash
 $ cd /var/www/peertube && \
     sudo unlink ./peertube-latest && \
     sudo -u peertube ln -s versions/peertube-${VERSION} ./peertube-latest
@@ -335,7 +343,7 @@ $ cd /var/www/peertube && \
 
 Check changes in nginx configuration:
 
-```
+```bash
 $ cd /var/www/peertube/versions
 $ diff "$(ls --sort=t | head -2 | tail -1)/support/nginx/peertube" "$(ls --sort=t | head -1)/support/nginx/peertube"
 ```
@@ -344,7 +352,7 @@ $ diff "$(ls --sort=t | head -2 | tail -1)/support/nginx/peertube" "$(ls --sort=
 
 Check changes in systemd configuration:
 
-```
+```bash
 $ cd /var/www/peertube/versions
 $ diff "$(ls --sort=t | head -2 | tail -1)/support/systemd/peertube.service" "$(ls --sort=t | head -1)/support/systemd/peertube.service"
 ```
@@ -353,19 +361,19 @@ $ diff "$(ls --sort=t | head -2 | tail -1)/support/systemd/peertube.service" "$(
 
 If you changed your nginx configuration:
 
-```
+```bash
 $ sudo systemctl reload nginx
 ```
 
 If you changed your systemd configuration:
 
-```
+```bash
 $ sudo systemctl daemon-reload
 ```
 
 Restart PeerTube and check the logs:
 
-```
+```bash
 $ sudo systemctl restart peertube && sudo journalctl -fu peertube
 ```
 
@@ -373,7 +381,7 @@ $ sudo systemctl restart peertube && sudo journalctl -fu peertube
 
 Change `peertube-latest` destination to the previous version and restore your SQL backup:
 
-```
+```bash
 $ OLD_VERSION="v0.42.42" && SQL_BACKUP_PATH="backup/sql-peertube_prod-2018-01-19T10:18+01:00.bak" && \
     cd /var/www/peertube && sudo -u peertube unlink ./peertube-latest && \
     sudo -u peertube ln -s "versions/peertube-$OLD_VERSION" peertube-latest && \
diff --git a/support/docker/production/Dockerfile.bullseye b/support/docker/production/Dockerfile.bullseye
index 7b2650538..ac97ddce3 100644
--- a/support/docker/production/Dockerfile.bullseye
+++ b/support/docker/production/Dockerfile.bullseye
@@ -1,9 +1,4 @@
-FROM node:12-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
+FROM node:14-bullseye-slim
 
 # Install dependencies
 RUN apt update \
@@ -21,10 +16,10 @@ WORKDIR /app
 
 USER peertube
 
-RUN yarn install --pure-lockfile \
-    && npm run build -- $NPM_RUN_BUILD_OPTS \
-    && rm -r ./node_modules ./client/node_modules \
-    && yarn install --pure-lockfile --production \
+RUN yarn install --pure-lockfile --network-timeout 1200000 --network-concurrency 20 \
+    && 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
 
 USER root