From a6edd50a5d292e29e6292754a7be95205ac7dbc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AC=E3=82=8B=E3=81=8D=E3=82=83=E3=81=A3=E3=81=A8?=
 <nullnyat@nca10.moe>
Date: Fri, 28 Jun 2024 11:16:12 +0900
Subject: [PATCH] =?UTF-8?q?chore(docker-compose):=20=E6=8E=A8=E5=A5=A8?=
 =?UTF-8?q?=E3=81=AE=E5=90=8D=E5=89=8D=E3=81=AB=E3=81=99=E3=82=8B=20(#1409?=
 =?UTF-8?q?6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

https://github.com/compose-spec/compose-spec/blob/5c18e329d5a15a15e4b636ed093b256b96615e33/spec.md#compose-file

* yaml to yml

* fix

* fix
---
 .devcontainer/{docker-compose.yml => compose.yml}         | 2 --
 .devcontainer/devcontainer.json                           | 2 +-
 .dockerignore                                             | 4 ++--
 .github/workflows/dockle.yml                              | 2 +-
 .gitignore                                                | 4 ++--
 CONTRIBUTING.md                                           | 2 +-
 docker-compose.local-db.yml => compose.local-db.yml       | 2 --
 docker-compose_example.yml => compose_example.yml         | 2 --
 packages/backend/test/{docker-compose.yml => compose.yml} | 2 --
 9 files changed, 7 insertions(+), 15 deletions(-)
 rename .devcontainer/{docker-compose.yml => compose.yml} (98%)
 rename docker-compose.local-db.yml => compose.local-db.yml (98%)
 rename docker-compose_example.yml => compose_example.yml (99%)
 rename packages/backend/test/{docker-compose.yml => compose.yml} (94%)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/compose.yml
similarity index 98%
rename from .devcontainer/docker-compose.yml
rename to .devcontainer/compose.yml
index a52d086fb6..d02d2a8f4a 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   app:
     build:
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 344edbd65d..7ea23e314e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
 	"name": "Misskey",
-	"dockerComposeFile": "docker-compose.yml",
+	"dockerComposeFile": "compose.yml",
 	"service": "app",
 	"workspaceFolder": "/workspace",
 	"features": {
diff --git a/.dockerignore b/.dockerignore
index 1de0c7982b..7dbb06e1d0 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -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
diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml
index 968971dd8d..c3dba4213d 100644
--- a/.github/workflows/dockle.yml
+++ b/.github/workflows/dockle.yml
@@ -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
diff --git a/.gitignore b/.gitignore
index bdc14fea0a..3466984cf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dcb625626d..06c2d2f21d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -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`.
 
diff --git a/docker-compose.local-db.yml b/compose.local-db.yml
similarity index 98%
rename from docker-compose.local-db.yml
rename to compose.local-db.yml
index 16ba4b49e1..3835cb23db 100644
--- a/docker-compose.local-db.yml
+++ b/compose.local-db.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 # このconfigは、 dockerでMisskey本体を起動せず、 redisとpostgresql などだけを起動します
 
 services:
diff --git a/docker-compose_example.yml b/compose_example.yml
similarity index 99%
rename from docker-compose_example.yml
rename to compose_example.yml
index 5cebbe4164..75d0d3a59c 100644
--- a/docker-compose_example.yml
+++ b/compose_example.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   web:
     build: .
diff --git a/packages/backend/test/docker-compose.yml b/packages/backend/test/compose.yml
similarity index 94%
rename from packages/backend/test/docker-compose.yml
rename to packages/backend/test/compose.yml
index f2d8990758..6593fc33dd 100644
--- a/packages/backend/test/docker-compose.yml
+++ b/packages/backend/test/compose.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   redistest:
     image: redis:7