From 58645b9ba91a03c77b61ffdeb2e831846579309e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?=
 <7822554+AlexTMjugador@users.noreply.github.com>
Date: Sat, 9 Aug 2025 22:00:10 +0200
Subject: [PATCH] Minor compose and editorconfig fixes (#4150)

* feat(docker-compose): give all containers a name

* fix(docker-compose): fix healthcheck for clickhouse container

For some reason, its CMD form always returned a healthcheck error, at
least in Podman.

* fix(editorconfig): address formatting regression for YAML files introduced in 8af65f58d9459aac421dafdf98e71a2811ba968a

* fix: frontend temp editorconfig change

* fix(editorconfig): add more extensions that use 2 spaces indentation

---------

Co-authored-by: Calum H. (IMB11) <hendersoncal117@gmail.com>
---
 .editorconfig      | 3 ++-
 docker-compose.yml | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 2697557e..94b3660e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,8 +11,9 @@ trim_trailing_whitespace = true
 max_line_length = 100
 
 [*.md]
+indent_size = 2
 max_line_length = off
 trim_trailing_whitespace = false
 
-[*.json]
+[*.{json,yml,yaml,ts,vue,scss,css,html,js,cjs,mjs,gltf,prettierrc}]
 indent_size = 2
diff --git a/docker-compose.yml b/docker-compose.yml
index 21e8c266..46645484 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,8 @@
+name: labrinth
 services:
   postgres_db:
     image: postgres:alpine
+    container_name: labrinth-postgres
     volumes:
       - db-data:/var/lib/postgresql/data
     ports:
@@ -16,6 +18,7 @@ services:
       retries: 3
   meilisearch:
     image: getmeili/meilisearch:v1.12.0
+    container_name: labrinth-meilisearch
     restart: on-failure
     ports:
       - '7700:7700'
@@ -31,6 +34,7 @@ services:
       retries: 3
   redis:
     image: redis:alpine
+    container_name: labrinth-redis
     restart: on-failure
     ports:
       - '6379:6379'
@@ -43,13 +47,14 @@ services:
       retries: 3
   clickhouse:
     image: clickhouse/clickhouse-server
+    container_name: labrinth-clickhouse
     ports:
       - '8123:8123'
     environment:
       CLICKHOUSE_USER: default
       CLICKHOUSE_PASSWORD: default
     healthcheck:
-      test: ['CMD', 'clickhouse-client', '--query', 'SELECT 1']
+      test: ['CMD-SHELL', 'clickhouse-client --query "SELECT 1"']
       interval: 3s
       timeout: 5s
       retries: 3