From 7a3c6bb88833a48253eb4795f4ee1127c6b5b5b0 Mon Sep 17 00:00:00 2001
From: Matt Williams <matt@makeable.co.uk>
Date: Thu, 15 Dec 2022 17:49:43 +0000
Subject: [PATCH] Dont use reserved foldername (#20582)
Co-authored-by: Effy Elden <effy@effy.space>
---
.devcontainer/devcontainer.json | 2 +-
.devcontainer/docker-compose.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5ac56c8428..01941a9d30 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 a61116fca4..95f401379c 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
--
GitLab