From eb7e4cc60ecd13ec6aad6ae5d1e80e8ee575b296 Mon Sep 17 00:00:00 2001 From: Yuriy Kirillov Date: Sat, 10 Oct 2026 23:18:56 +0200 Subject: [PATCH] fix(rybbit): stop redeclaring the included clickhouse service v1.4.1's fix for #225 broke deploy outright: apps/rybbit/docker-compose.yml redeclared services.clickhouse (brought in via clickhouse-26.5.yml's include:) just to add one environment key, and Docker Compose rejects that unconditionally on anything before v5.0.0 with "services.clickhouse conflicts with imported resource" - confirmed failing on v2.40.3 (what's actually running on the target host) and passing on v5.5.1, so the two Compose releases disagree and the older one is what matters here. `docker compose pull` fails before touching anything, so the botched release caused no actual damage, but it can't be deployed as shipped. Move CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=1 directly into clickhouse-26.5.yml's own environment block instead - no service redeclaration anywhere, so the include/override conflict class doesn't apply. rybbit is this template's only consumer today, so there's no other app to grant unwanted self-management rights to. Verified against a real docker-compose v2.40.3 binary (matching the target host) in a scratch copy of apps/: `config` resolves without the conflict error, and `pull` proceeds past config parsing. Fixes #225 (again) Co-Authored-By: Claude Sonnet 5 --- apps/clickhouse-26.5.yml | 1 + apps/rybbit/docker-compose.yml | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/clickhouse-26.5.yml b/apps/clickhouse-26.5.yml index 868754f4..7d63c538 100644 --- a/apps/clickhouse-26.5.yml +++ b/apps/clickhouse-26.5.yml @@ -6,6 +6,7 @@ services: environment: CLICKHOUSE_DB: ${APP_NAME} CLICKHOUSE_PASSWORD: ${DATABASE_PASSWORD} + CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1 volumes: - ${DATA_DIR}/clickhouse/data:/var/lib/clickhouse - ${DATA_DIR}/clickhouse/logs:/var/log/clickhouse-server diff --git a/apps/rybbit/docker-compose.yml b/apps/rybbit/docker-compose.yml index c539f374..f3416ac8 100644 --- a/apps/rybbit/docker-compose.yml +++ b/apps/rybbit/docker-compose.yml @@ -23,9 +23,6 @@ x-internal-env: &internal-env REDIS_HOST: redis REDIS_PORT: 6379 services: - clickhouse: - environment: - CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1 client: image: ghcr.io/rybbit-io/rybbit-client extends: