diff options
| author | RyotaK <49341894+Ry0taK@users.noreply.github.com> | 2023-02-14 13:17:34 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-14 13:17:34 +0900 |
| commit | c7fbf5637ff6a4781f81babf81bee395b06a71c7 (patch) | |
| tree | 13b3f8635847c0c897467595d1286d22f0285115 | |
| parent | fix(client): use tabler icons (#9915) (diff) | |
| download | sharkey-c7fbf5637ff6a4781f81babf81bee395b06a71c7.tar.gz sharkey-c7fbf5637ff6a4781f81babf81bee395b06a71c7.tar.bz2 sharkey-c7fbf5637ff6a4781f81babf81bee395b06a71c7.zip | |
fix: Dev Containerの設定を修正 (#9921)
* Dev Containerの設定を修正
* CONTRIBUTING.mdにDev Container使用時の注意書きを追加
* 注意書きを改行する
| -rw-r--r-- | .devcontainer/devcontainer.json | 4 | ||||
| -rw-r--r-- | .devcontainer/docker-compose.yml | 7 | ||||
| -rwxr-xr-x | .devcontainer/init.sh | 1 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 3 |
4 files changed, 9 insertions, 6 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e92f9dff78..fde7ec0f2b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,10 +2,10 @@ "name": "Misskey", "dockerComposeFile": "docker-compose.yml", "service": "app", - "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", + "workspaceFolder": "/workspace", "features": { "ghcr.io/devcontainers-contrib/features/pnpm:2": {} }, "forwardPorts": [3000], - "postCreateCommand": ".devcontainer/init.sh" + "postCreateCommand": "sudo chmod 755 .devcontainer/init.sh && .devcontainer/init.sh" } diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 6cb21844ac..6ec3c86a4a 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -7,7 +7,7 @@ services: dockerfile: Dockerfile volumes: - - ../..:/workspaces:cached + - ../:/workspace:cached command: sleep infinity @@ -21,7 +21,7 @@ services: networks: - internal_network volumes: - - ../redis:/data + - redis-data:/data healthcheck: test: "redis-cli ping" interval: 5s @@ -37,7 +37,7 @@ services: POSTGRES_PASSWORD: postgres POSTGRES_DB: misskey volumes: - - ../db:/var/lib/postgresql/data + - postgres-data:/var/lib/postgresql/data healthcheck: test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB" interval: 5s @@ -45,6 +45,7 @@ services: volumes: postgres-data: + redis-data: networks: internal_network: diff --git a/.devcontainer/init.sh b/.devcontainer/init.sh index 552b229fa5..450c3920c3 100755 --- a/.devcontainer/init.sh +++ b/.devcontainer/init.sh @@ -2,6 +2,7 @@ set -xe +sudo chown -R node /workspace git submodule update --init pnpm install --frozen-lockfile cp .devcontainer/devcontainer.yml .config/default.yml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index de0a1abb45..48d8a40dea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -113,7 +113,8 @@ command. ### Dev Container Instead of running `pnpm` locally, you can use Dev Container to set up your development environment. -To use Dev Container, open the project directory on VSCode with Dev Containers installed. +To use Dev Container, open the project directory on VSCode with Dev Containers installed. +**Note:** If you are using Windows, please clone the repository with WSL. Using Git for Windows will result in broken files due to the difference in how newlines are handled. It will run the following command automatically inside the container. ``` bash |