diff options
-rw-r--r-- | .github/workflows/benchmark.yml | 2 | ||||
-rw-r--r-- | .github/workflows/test.yml | 2 | ||||
-rw-r--r-- | server/initializers/checker-before-init.ts | 4 | ||||
-rw-r--r-- | support/doc/dependencies.md | 14 | ||||
-rw-r--r-- | support/docker/production/Dockerfile.bullseye | 2 |
5 files changed, 14 insertions, 10 deletions
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 7e8259d27..8811f0f45 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml | |||
@@ -35,7 +35,7 @@ jobs: | |||
35 | 35 | ||
36 | - uses: './.github/actions/reusable-prepare-peertube-build' | 36 | - uses: './.github/actions/reusable-prepare-peertube-build' |
37 | with: | 37 | with: |
38 | node-version: '12.x' | 38 | node-version: '14.x' |
39 | 39 | ||
40 | - uses: './.github/actions/reusable-prepare-peertube-run' | 40 | - uses: './.github/actions/reusable-prepare-peertube-run' |
41 | 41 | ||
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 030ec3790..18cf60a0a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml | |||
@@ -52,7 +52,7 @@ jobs: | |||
52 | 52 | ||
53 | - uses: './.github/actions/reusable-prepare-peertube-build' | 53 | - uses: './.github/actions/reusable-prepare-peertube-build' |
54 | with: | 54 | with: |
55 | node-version: '12.x' | 55 | node-version: '14.x' |
56 | 56 | ||
57 | - uses: './.github/actions/reusable-prepare-peertube-run' | 57 | - uses: './.github/actions/reusable-prepare-peertube-run' |
58 | 58 | ||
diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index d2f3bb128..458005b98 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts | |||
@@ -119,6 +119,10 @@ function checkNodeVersion () { | |||
119 | if (major <= 10) { | 119 | if (major <= 10) { |
120 | throw new Error('Your NodeJS version ' + v + ' is not supported. Please upgrade.') | 120 | throw new Error('Your NodeJS version ' + v + ' is not supported. Please upgrade.') |
121 | } | 121 | } |
122 | |||
123 | if (major <= 12) { | ||
124 | logger.warn('Your NodeJS version ' + v + ' is deprecated. Please upgrade.') | ||
125 | } | ||
122 | } | 126 | } |
123 | 127 | ||
124 | // --------------------------------------------------------------------------- | 128 | // --------------------------------------------------------------------------- |
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 | |||
77 | 1. Run: | 77 | 1. Run: |
78 | 78 | ||
79 | ``` | 79 | ``` |
80 | sudo pacman -S nodejs-lts-fermium yarn ffmpeg postgresql openssl redis git wget unzip python base-devel npm nginx | 80 | sudo pacman -S nodejs-lts-fermium yarn ffmpeg postgresql openssl redis git wget unzip python base-devel npm nginx |
81 | ``` | 81 | ``` |
82 | 82 | ||
83 | Now that dependencies are installed, before running PeerTube you should start PostgreSQL and Redis: | 83 | Now that dependencies are installed, before running PeerTube you should start PostgreSQL and Redis: |
@@ -88,7 +88,7 @@ sudo systemctl start redis postgresql | |||
88 | 88 | ||
89 | ## CentOS 7 | 89 | ## CentOS 7 |
90 | 90 | ||
91 | 1. Install NodeJS 12.x: | 91 | 1. Install NodeJS 14.x: |
92 | [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora) | 92 | [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora) |
93 | 93 | ||
94 | 2. Install yarn: | 94 | 2. Install yarn: |
@@ -135,7 +135,7 @@ sudo systemctl enable --now postgresql | |||
135 | 135 | ||
136 | ## Centos 8 | 136 | ## Centos 8 |
137 | 137 | ||
138 | 1. Install NodeJS 12.x: | 138 | 1. Install NodeJS 14.x: |
139 | [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora) | 139 | [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora) |
140 | 140 | ||
141 | 2. Install yarn: | 141 | 2. Install yarn: |
@@ -180,9 +180,9 @@ sudo systemctl enable --now postgresql | |||
180 | sudo dnf update -y | 180 | sudo dnf update -y |
181 | ``` | 181 | ``` |
182 | 182 | ||
183 | 2. Install NodeJS 12.x (or 14): | 183 | 2. Install NodeJS 14.x: |
184 | ``` | 184 | ``` |
185 | sudo dnf module install -y nodejs:12 | 185 | sudo dnf module install -y nodejs:14 |
186 | ``` | 186 | ``` |
187 | 187 | ||
188 | 3. Install yarn: | 188 | 3. Install yarn: |
@@ -239,7 +239,7 @@ su my-peertube-user | |||
239 | 3. (Optional) Install certbot (choose instructions for your distribution): | 239 | 3. (Optional) Install certbot (choose instructions for your distribution): |
240 | [https://certbot.eff.org/all-instructions](https://certbot.eff.org/all-instructions) | 240 | [https://certbot.eff.org/all-instructions](https://certbot.eff.org/all-instructions) |
241 | 241 | ||
242 | 4. Install NodeJS 12.x: | 242 | 4. Install NodeJS 14.x: |
243 | [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora) | 243 | [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora) |
244 | 244 | ||
245 | 5. Install yarn: | 245 | 5. Install yarn: |
@@ -331,7 +331,7 @@ echo fs.inotify.max_user_watches=582222 | sudo tee -a /etc/sysctl.conf && sudo s | |||
331 | 2. Install Node.JS | 331 | 2. Install Node.JS |
332 | 332 | ||
333 | ``` | 333 | ``` |
334 | sudo dnf module install nodejs:12 | 334 | sudo dnf module install nodejs:14 |
335 | ``` | 335 | ``` |
336 | 336 | ||
337 | 3. Install Yarn | 337 | 3. Install Yarn |
diff --git a/support/docker/production/Dockerfile.bullseye b/support/docker/production/Dockerfile.bullseye index ec06d6b1d..262fc427a 100644 --- a/support/docker/production/Dockerfile.bullseye +++ b/support/docker/production/Dockerfile.bullseye | |||
@@ -1,4 +1,4 @@ | |||
1 | FROM node:12-bullseye-slim | 1 | FROM node:14-bullseye-slim |
2 | 2 | ||
3 | # Allow to pass extra options to the npm run build | 3 | # Allow to pass extra options to the npm run build |
4 | # eg: --light --light-fr to not build all client languages | 4 | # eg: --light --light-fr to not build all client languages |