diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-12-15 20:25:25 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-12-15 20:25:25 +0100 |
commit | f3a4d57be14b40d1e3a6ad9e1a1f9337dafc872e (patch) | |
tree | 623c4b710fed94a7280587da7d66863ab489957c /.devcontainer/docker-compose.yml | |
parent | 3868ba683d56dbbeecc839fdeaeb7b3d0b18bb9a (diff) | |
parent | f847f67410c75036edb2c4b45d0db048af0481c9 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring
Diffstat (limited to '.devcontainer/docker-compose.yml')
-rw-r--r-- | .devcontainer/docker-compose.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 46f42c454..95f401379 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -11,9 +11,9 @@ 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 + - ..:/mastodon:cached environment: RAILS_ENV: development NODE_ENV: development |