summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorおやき <154856000+oyakimochocho@users.noreply.github.com>2024-06-12 11:08:42 +0900
committerGitHub <noreply@github.com>2024-06-12 11:08:42 +0900
commit92367cf70065dca5e33ece2266f0318c3b682d1a (patch)
tree0930c511862f48edc806ba6376630160ed024346
parentfix(frontend): 追加情報のラベルを投稿者のサーバーの絵文... (diff)
downloadsharkey-92367cf70065dca5e33ece2266f0318c3b682d1a.tar.gz
sharkey-92367cf70065dca5e33ece2266f0318c3b682d1a.tar.bz2
sharkey-92367cf70065dca5e33ece2266f0318c3b682d1a.zip
node_modulesをvolume化して高速化+パーミッション問題回避、git submodule update時にローカルにsubmoduleがあっても問題が起こらないようにする (#13956)
-rw-r--r--.devcontainer/devcontainer.json2
-rw-r--r--.devcontainer/docker-compose.yml2
-rwxr-xr-x.devcontainer/init.sh3
3 files changed, 5 insertions, 2 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 31b6212cb5..344edbd65d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -10,7 +10,7 @@
"ghcr.io/devcontainers-contrib/features/corepack:1": {}
},
"forwardPorts": [3000],
- "postCreateCommand": "sudo chmod 755 .devcontainer/init.sh && .devcontainer/init.sh",
+ "postCreateCommand": "/bin/bash .devcontainer/init.sh",
"customizations": {
"vscode": {
"extensions": [
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 2809cd2ca4..a52d086fb6 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -8,6 +8,7 @@ services:
volumes:
- ../:/workspace:cached
+ - node_modules:/workspace/node_modules
command: sleep infinity
@@ -46,6 +47,7 @@ services:
volumes:
postgres-data:
redis-data:
+ node_modules:
networks:
internal_network:
diff --git a/.devcontainer/init.sh b/.devcontainer/init.sh
index 729e1a9d2d..55fb1e6fa6 100755
--- a/.devcontainer/init.sh
+++ b/.devcontainer/init.sh
@@ -2,7 +2,8 @@
set -xe
-sudo chown -R node /workspace
+sudo chown node node_modules
+git config --global --add safe.directory /workspace
git submodule update --init
corepack install
corepack enable