chore(docker-compose): 推奨の名前にする (#14096)

* chore(docker-compose): 推奨の名前にする

5c18e329d5/spec.md (compose-file)

* yaml to yml

* fix

* fix
This commit is contained in:
ぬるきゃっと 2024-06-28 11:16:12 +09:00 committed by GitHub
parent 4096dabe1e
commit a6edd50a5d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 7 additions and 15 deletions

View file

@ -1,5 +1,3 @@
version: '3.8'
services:
app:
build:

View file

@ -1,6 +1,6 @@
{
"name": "Misskey",
"dockerComposeFile": "docker-compose.yml",
"dockerComposeFile": "compose.yml",
"service": "app",
"workspaceFolder": "/workspace",
"features": {

View file

@ -7,7 +7,7 @@ Dockerfile
build/
built/
db/
docker-compose.yml
.devcontainer/compose.yml
node_modules/
packages/*/node_modules
redis/
@ -28,4 +28,4 @@ fluent-emojis/
.idea/
packages/*/.vscode/
packages/backend/test/docker-compose.yml
packages/backend/test/compose.yml

View file

@ -22,7 +22,7 @@ jobs:
sudo dpkg -i dockle.deb
- run: |
cp .config/docker_example.env .config/docker.env
cp ./docker-compose_example.yml ./docker-compose.yml
cp ./compose_example.yml ./compose.yml
- run: |
docker compose up -d web
docker tag "$(docker compose images web | awk 'OFS=":" {print $4}' | tail -n +2)" misskey-web:latest

4
.gitignore vendored
View file

@ -35,8 +35,8 @@ coverage
!/.config/example.yml
!/.config/docker_example.yml
!/.config/docker_example.env
docker-compose.yml
!/.devcontainer/docker-compose.yml
.devcontainer/compose.yml
!/.devcontainer/compose.yml
# misskey
/build

View file

@ -165,7 +165,7 @@ cp .github/misskey/test.yml .config/
```
Prepare DB/Redis for testing.
```
docker compose -f packages/backend/test/docker-compose.yml up
docker compose -f packages/backend/test/compose.yaml up
```
Alternatively, prepare an empty (data can be erased) DB and edit `.config/test.yml`.

View file

@ -1,5 +1,3 @@
version: "3"
# このconfigは、 dockerでMisskey本体を起動せず、 redisとpostgresql などだけを起動します
services:

View file

@ -1,5 +1,3 @@
version: "3"
services:
web:
build: .

View file

@ -1,5 +1,3 @@
version: "3"
services:
redistest:
image: redis:7