diff options
| author | Matt Williams <matt@makeable.co.uk> | 2022-12-15 17:49:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-15 18:49:43 +0100 |
| commit | 7a3c6bb88833a48253eb4795f4ee1127c6b5b5b0 (patch) | |
| tree | 51ed897109c320f8f45dbd2705a7b204c89146e7 | |
| parent | c761e7a5ef89afd4ed7ac470ad1155a78d3c4cfa (diff) | |
| download | mastodon-7a3c6bb88833a48253eb4795f4ee1127c6b5b5b0.tar mastodon-7a3c6bb88833a48253eb4795f4ee1127c6b5b5b0.tar.gz mastodon-7a3c6bb88833a48253eb4795f4ee1127c6b5b5b0.tar.bz2 mastodon-7a3c6bb88833a48253eb4795f4ee1127c6b5b5b0.zip | |
Dont use reserved foldername (#20582)
Co-authored-by: Effy Elden <effy@effy.space>
| -rw-r--r-- | .devcontainer/devcontainer.json | 2 | ||||
| -rw-r--r-- | .devcontainer/docker-compose.yml | 2 |
2 files changed, 2 insertions, 2 deletions
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 |