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 8af65f58d9

* fix: frontend temp editorconfig change

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

---------

Co-authored-by: Calum H. (IMB11) <hendersoncal117@gmail.com>
This commit is contained in:
Alejandro González
2025-08-09 22:00:10 +02:00
committed by GitHub
parent 544f63512a
commit 58645b9ba9
2 changed files with 8 additions and 2 deletions

View File

@@ -11,8 +11,9 @@ trim_trailing_whitespace = true
max_line_length = 100 max_line_length = 100
[*.md] [*.md]
indent_size = 2
max_line_length = off max_line_length = off
trim_trailing_whitespace = false trim_trailing_whitespace = false
[*.json] [*.{json,yml,yaml,ts,vue,scss,css,html,js,cjs,mjs,gltf,prettierrc}]
indent_size = 2 indent_size = 2

View File

@@ -1,6 +1,8 @@
name: labrinth
services: services:
postgres_db: postgres_db:
image: postgres:alpine image: postgres:alpine
container_name: labrinth-postgres
volumes: volumes:
- db-data:/var/lib/postgresql/data - db-data:/var/lib/postgresql/data
ports: ports:
@@ -16,6 +18,7 @@ services:
retries: 3 retries: 3
meilisearch: meilisearch:
image: getmeili/meilisearch:v1.12.0 image: getmeili/meilisearch:v1.12.0
container_name: labrinth-meilisearch
restart: on-failure restart: on-failure
ports: ports:
- '7700:7700' - '7700:7700'
@@ -31,6 +34,7 @@ services:
retries: 3 retries: 3
redis: redis:
image: redis:alpine image: redis:alpine
container_name: labrinth-redis
restart: on-failure restart: on-failure
ports: ports:
- '6379:6379' - '6379:6379'
@@ -43,13 +47,14 @@ services:
retries: 3 retries: 3
clickhouse: clickhouse:
image: clickhouse/clickhouse-server image: clickhouse/clickhouse-server
container_name: labrinth-clickhouse
ports: ports:
- '8123:8123' - '8123:8123'
environment: environment:
CLICKHOUSE_USER: default CLICKHOUSE_USER: default
CLICKHOUSE_PASSWORD: default CLICKHOUSE_PASSWORD: default
healthcheck: healthcheck:
test: ['CMD', 'clickhouse-client', '--query', 'SELECT 1'] test: ['CMD-SHELL', 'clickhouse-client --query "SELECT 1"']
interval: 3s interval: 3s
timeout: 5s timeout: 5s
retries: 3 retries: 3