mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
NodeJS 14 support - circleci/docker/.nvmrc (#16163)
* 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
This commit is contained in:
parent
4ac78e2a06
commit
229f5d1681
4 changed files with 5 additions and 5 deletions
|
@ -209,7 +209,7 @@ jobs:
|
|||
test-webui:
|
||||
<<: *defaults
|
||||
docker:
|
||||
- image: circleci/node:12-buster
|
||||
- image: circleci/node:14-buster
|
||||
steps:
|
||||
- *attach_workspace
|
||||
- run:
|
||||
|
|
2
.nvmrc
2
.nvmrc
|
@ -1 +1 @@
|
|||
12
|
||||
14
|
||||
|
|
|
@ -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 \
|
||||
|
|
2
Vagrantfile
vendored
2
Vagrantfile
vendored
|
@ -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"]}
|
||||
|
|
Loading…
Reference in a new issue