summaryrefslogtreecommitdiff
path: root/.devcontainer
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2023-03-05 11:16:41 +0000
committertamaina <tamaina@hotmail.co.jp>2023-03-05 11:16:41 +0000
commit65d7c4764727d3ac186bf2ba63f68f9e143f29a8 (patch)
tree7984032d4dd47e4a40d6937dfbc99ab9799fc4c5 /.devcontainer
parentchore: remove deprecated vs code extention (diff)
parentMerge pull request #10213 from Ry0taK/fix/disable-jest-autorun (diff)
downloadmisskey-65d7c4764727d3ac186bf2ba63f68f9e143f29a8.tar.gz
misskey-65d7c4764727d3ac186bf2ba63f68f9e143f29a8.tar.bz2
misskey-65d7c4764727d3ac186bf2ba63f68f9e143f29a8.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to '.devcontainer')
-rw-r--r--.devcontainer/devcontainer.json3
-rw-r--r--.devcontainer/docker-compose.yml2
-rwxr-xr-x.devcontainer/init.sh1
3 files changed, 5 insertions, 1 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index bfd73778cc..6accd43476 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,6 +3,9 @@
"dockerComposeFile": "docker-compose.yml",
"service": "app",
"workspaceFolder": "/workspace",
+ "features": {
+ "ghcr.io/devcontainers-contrib/features/pnpm:2": {}
+ },
"forwardPorts": [3000],
"postCreateCommand": "sudo chmod 755 .devcontainer/init.sh && .devcontainer/init.sh",
"customizations": {
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 6ec3c86a4a..8f8c5a13ab 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -16,7 +16,7 @@ services:
- external_network
redis:
- restart: always
+ restart: unless-stopped
image: redis:7-alpine
networks:
- internal_network
diff --git a/.devcontainer/init.sh b/.devcontainer/init.sh
index 450c3920c3..bcad3e6d85 100755
--- a/.devcontainer/init.sh
+++ b/.devcontainer/init.sh
@@ -4,6 +4,7 @@ set -xe
sudo chown -R node /workspace
git submodule update --init
+pnpm config set store-dir /home/node/.local/share/pnpm/store
pnpm install --frozen-lockfile
cp .devcontainer/devcontainer.yml .config/default.yml
pnpm build