From 1e49be33289b969be64620b904d589158e7b579a Mon Sep 17 00:00:00 2001 From: Effy Elden Date: Fri, 16 Dec 2022 03:43:26 +1100 Subject: Align everything to Node.js 16 (#22223) * Update nvmrc to Node.js 16 * Update package.json minimum Node engine to 16 * Update README requirements to Node.js 16 * Update devcontainer Node.js version to 16 * Update devcontainer Dockerfile Node.js choices to LTS versions that are still in support/maintenance * Pin CircleCI Node image to 16 * Fix YAML type issue * Update CircleCI Node.js to 16.18 to match #22019 --- .devcontainer/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.devcontainer/docker-compose.yml') diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 46f42c454..a61116fca 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -11,7 +11,7 @@ services: # Use -bullseye variants on local arm64/Apple Silicon. VARIANT: '3.0-bullseye' # Optional Node.js version to install - NODE_VERSION: '14' + NODE_VERSION: '16' volumes: - ..:/workspaces/mastodon:cached environment: -- cgit From 7a3c6bb88833a48253eb4795f4ee1127c6b5b5b0 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Thu, 15 Dec 2022 17:49:43 +0000 Subject: Dont use reserved foldername (#20582) Co-authored-by: Effy Elden --- .devcontainer/devcontainer.json | 2 +- .devcontainer/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to '.devcontainer/docker-compose.yml') diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5ac56c842..01941a9d3 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "name": "Mastodon", "dockerComposeFile": "docker-compose.yml", "service": "app", - "workspaceFolder": "/workspaces/mastodon", + "workspaceFolder": "/mastodon", // Set *default* container specific settings.json values on container create. "settings": {}, diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index a61116fca..95f401379 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -13,7 +13,7 @@ services: # Optional Node.js version to install NODE_VERSION: '16' volumes: - - ..:/workspaces/mastodon:cached + - ..:/mastodon:cached environment: RAILS_ENV: development NODE_ENV: development -- cgit