fix: Dev Containerの設定を修正 (#9921)

* Dev Containerの設定を修正

* CONTRIBUTING.mdにDev Container使用時の注意書きを追加

* 注意書きを改行する
This commit is contained in:
RyotaK 2023-02-14 13:17:34 +09:00 committed by GitHub
parent 5cf5b66696
commit c7fbf5637f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions

View file

@ -2,10 +2,10 @@
"name": "Misskey", "name": "Misskey",
"dockerComposeFile": "docker-compose.yml", "dockerComposeFile": "docker-compose.yml",
"service": "app", "service": "app",
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", "workspaceFolder": "/workspace",
"features": { "features": {
"ghcr.io/devcontainers-contrib/features/pnpm:2": {} "ghcr.io/devcontainers-contrib/features/pnpm:2": {}
}, },
"forwardPorts": [3000], "forwardPorts": [3000],
"postCreateCommand": ".devcontainer/init.sh" "postCreateCommand": "sudo chmod 755 .devcontainer/init.sh && .devcontainer/init.sh"
} }

View file

@ -7,7 +7,7 @@ services:
dockerfile: Dockerfile dockerfile: Dockerfile
volumes: volumes:
- ../..:/workspaces:cached - ../:/workspace:cached
command: sleep infinity command: sleep infinity
@ -21,7 +21,7 @@ services:
networks: networks:
- internal_network - internal_network
volumes: volumes:
- ../redis:/data - redis-data:/data
healthcheck: healthcheck:
test: "redis-cli ping" test: "redis-cli ping"
interval: 5s interval: 5s
@ -37,7 +37,7 @@ services:
POSTGRES_PASSWORD: postgres POSTGRES_PASSWORD: postgres
POSTGRES_DB: misskey POSTGRES_DB: misskey
volumes: volumes:
- ../db:/var/lib/postgresql/data - postgres-data:/var/lib/postgresql/data
healthcheck: healthcheck:
test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB" test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"
interval: 5s interval: 5s
@ -45,6 +45,7 @@ services:
volumes: volumes:
postgres-data: postgres-data:
redis-data:
networks: networks:
internal_network: internal_network:

View file

@ -2,6 +2,7 @@
set -xe set -xe
sudo chown -R node /workspace
git submodule update --init git submodule update --init
pnpm install --frozen-lockfile pnpm install --frozen-lockfile
cp .devcontainer/devcontainer.yml .config/default.yml cp .devcontainer/devcontainer.yml .config/default.yml

View file

@ -113,7 +113,8 @@ command.
### Dev Container ### Dev Container
Instead of running `pnpm` locally, you can use Dev Container to set up your development environment. 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. It will run the following command automatically inside the container.
``` bash ``` bash