]> cat aescling's git repositories - mastodon.git/commitdiff
NodeJS 14 support - circleci/docker/.nvmrc (#16163)
authorShlee <github@shl.ee>
Tue, 10 Aug 2021 20:56:13 +0000 (04:56 +0800)
committerGitHub <noreply@github.com>
Tue, 10 Aug 2021 20:56:13 +0000 (22:56 +0200)
* Update config.yml

* Update Dockerfile

* Update .nvmrc

* Update Dockerfile

* NodeJS 10 is EOL.

* Update package.json

* Update README.md

* Update Vagrantfile

* Update Dockerfile

* Update Dockerfile

.circleci/config.yml
.nvmrc
Dockerfile
Vagrantfile

index 42c0582958c60dfd45e76733b1e90674ce2a7109..bfded07debed1fe840f895e53d43f2c3f4b79135 100644 (file)
@@ -209,7 +209,7 @@ jobs:
   test-webui:
     <<: *defaults
     docker:
-      - image: circleci/node:12-buster
+      - image: circleci/node:14-buster
     steps:
       - *attach_workspace
       - run:
diff --git a/.nvmrc b/.nvmrc
index 48082f72f087ce7e6fa75b9c41d7387daecd447b..8351c19397f4fcd5238d10034fa7fa384f14d580 100644 (file)
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-12
+14
index 8279e873595531f8bfaa7e031013362c37ba3bb3..fb596fdbfed31a358515dbb476b8ffa2a5f6af86 100644 (file)
@@ -3,8 +3,8 @@ FROM ubuntu:20.04 as build-dep
 # Use bash for the shell
 SHELL ["/bin/bash", "-c"]
 
-# Install Node v12 (LTS)
-ENV NODE_VER="12.21.0"
+# Install Node v14 (LTS)
+ENV NODE_VER="14.17.4"
 RUN ARCH= && \
     dpkgArch="$(dpkg --print-architecture)" && \
   case "${dpkgArch##*-}" in \
index 4d0cc0f762122bcd1350a325f9226baa9377cf5b..82d41f7d57b82b38a68b2b164dedbad23b837044 100644 (file)
@@ -12,7 +12,7 @@ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
 sudo apt-add-repository 'deb https://dl.yarnpkg.com/debian/ stable main'
 
 # Add repo for NodeJS
-curl -sL https://deb.nodesource.com/setup_12.x | sudo bash -
+curl -sL https://deb.nodesource.com/setup_14.x | sudo bash -
 
 # Add firewall rule to redirect 80 to PORT and save
 sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port #{ENV["PORT"]}