Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refactor ClickHouse configuration in Docker Compose files (#543)

Bill Yang10989848dda2
diff --git a/clickhouse_config/enable_json.xml b/clickhouse_config/enable_json.xml
deleted file mode 100644
index ac1440813..000000000
--- a/clickhouse_config/enable_json.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<clickhouse>
- <settings>
- <enable_json_type>1</enable_json_type>
- </settings>
-</clickhouse>
\ No newline at end of file
diff --git a/clickhouse_config/logging_rules.xml b/clickhouse_config/logging_rules.xml
deleted file mode 100644
index cc56fa4b8..000000000
--- a/clickhouse_config/logging_rules.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<clickhouse>
- <logger>
- <level>warning</level>
- <console>true</console>
- </logger>
- <query_thread_log remove="remove"/>
- <query_log remove="remove"/>
- <text_log remove="remove"/>
- <trace_log remove="remove"/>
- <metric_log remove="remove"/>
- <asynchronous_metric_log remove="remove"/>
- <session_log remove="remove"/>
- <part_log remove="remove"/>
- <latency_log remove="remove"/>
- <processors_profile_log remove="remove"/>
-</clickhouse>
\ No newline at end of file
diff --git a/clickhouse_config/network.xml b/clickhouse_config/network.xml
deleted file mode 100644
index e4f4b22e6..000000000
--- a/clickhouse_config/network.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<clickhouse>
- <listen_host>0.0.0.0</listen_host>
-</clickhouse>
\ No newline at end of file
diff --git a/clickhouse_config/user_logging.xml b/clickhouse_config/user_logging.xml
deleted file mode 100644
index 0b2dba31c..000000000
--- a/clickhouse_config/user_logging.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<clickhouse>
- <profiles>
- <default>
- <log_queries>0</log_queries>
- <log_query_threads>0</log_query_threads>
- <log_processors_profiles>0</log_processors_profiles>
- </default>
- </profiles>
-</clickhouse>
\ No newline at end of file
diff --git a/docker-compose.cloud.yml b/docker-compose.cloud.yml
index a53279a1b..6a903e271 100644
--- a/docker-compose.cloud.yml
+++ b/docker-compose.cloud.yml
@@ -22,12 +22,17 @@ services:
clickhouse:
container_name: clickhouse
image: clickhouse/clickhouse-server:25.4.2
- ports:
- - "8123:8123"
- - "9000:9000"
volumes:
- clickhouse-data:/var/lib/clickhouse
- - ./clickhouse_config:/etc/clickhouse-server/config.d
+ configs:
+ - source: clickhouse_network
+ target: /etc/clickhouse-server/config.d/network.xml
+ - source: clickhouse_json
+ target: /etc/clickhouse-server/config.d/enable_json.xml
+ - source: clickhouse_logging
+ target: /etc/clickhouse-server/config.d/logging_rules.xml
+ - source: clickhouse_user_logging
+ target: /etc/clickhouse-server/config.d/user_logging.xml
environment:
- CLICKHOUSE_DB=${CLICKHOUSE_DB:-analytics}
- CLICKHOUSE_USER=${CLICKHOUSE_USER:-default}
@@ -143,3 +148,49 @@ volumes:
redis-data:
caddy_data: # Persistent volume for Caddy's certificates and state
caddy_config: # Persistent volume for Caddy's configuration cache (optional but good practice)
+
+configs:
+ clickhouse_network:
+ content: |
+ <clickhouse>
+ <listen_host>0.0.0.0</listen_host>
+ </clickhouse>
+
+ clickhouse_json:
+ content: |
+ <clickhouse>
+ <settings>
+ <enable_json_type>1</enable_json_type>
+ </settings>
+ </clickhouse>
+
+ clickhouse_logging:
+ content: |
+ <clickhouse>
+ <logger>
+ <level>warning</level>
+ <console>true</console>
+ </logger>
+ <query_thread_log remove="remove"/>
+ <query_log remove="remove"/>
+ <text_log remove="remove"/>
+ <trace_log remove="remove"/>
+ <metric_log remove="remove"/>
+ <asynchronous_metric_log remove="remove"/>
+ <session_log remove="remove"/>
+ <part_log remove="remove"/>
+ <latency_log remove="remove"/>
+ <processors_profile_log remove="remove"/>
+ </clickhouse>
+
+ clickhouse_user_logging:
+ content: |
+ <clickhouse>
+ <profiles>
+ <default>
+ <log_queries>0</log_queries>
+ <log_query_threads>0</log_query_threads>
+ <log_processors_profiles>0</log_processors_profiles>
+ </default>
+ </profiles>
+ </clickhouse>
diff --git a/docker-compose.yml b/docker-compose.yml
index 39106f547..bdefc37e9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,12 +22,17 @@ services:
clickhouse:
container_name: clickhouse
image: clickhouse/clickhouse-server:25.4.2
- ports:
- - "8123:8123"
- - "9000:9000"
volumes:
- clickhouse-data:/var/lib/clickhouse
- - ./clickhouse_config:/etc/clickhouse-server/config.d
+ configs:
+ - source: clickhouse_network
+ target: /etc/clickhouse-server/config.d/network.xml
+ - source: clickhouse_json
+ target: /etc/clickhouse-server/config.d/enable_json.xml
+ - source: clickhouse_logging
+ target: /etc/clickhouse-server/config.d/logging_rules.xml
+ - source: clickhouse_user_logging
+ target: /etc/clickhouse-server/config.d/user_logging.xml
environment:
- CLICKHOUSE_DB=${CLICKHOUSE_DB:-analytics}
- CLICKHOUSE_USER=${CLICKHOUSE_USER:-default}
@@ -57,15 +62,15 @@ services:
start_period: 10s
restart: unless-stopped
- redis:
- image: redis:7-alpine
- container_name: redis
- ports:
- - "127.0.0.1:6379:6379" # Only accessible locally
- volumes:
- - redis-data:/data
- restart: unless-stopped
- command: ["redis-server", "--appendonly", "yes"]
+ # redis:
+ # image: redis:7-alpine
+ # container_name: redis
+ # ports:
+ # - "127.0.0.1:6379:6379"
+ # volumes:
+ # - redis-data:/data
+ # restart: unless-stopped
+ # command: ["redis-server", "--appendonly", "yes"]
backend:
image: ghcr.io/rybbit-io/rybbit-backend:${IMAGE_TAG:-latest}
@@ -89,16 +94,16 @@ services:
- BASE_URL=${BASE_URL}
- DISABLE_SIGNUP=${DISABLE_SIGNUP}
- DISABLE_TELEMETRY=${DISABLE_TELEMETRY}
- # Redis configuration
- - REDIS_HOST=redis
- - REDIS_PORT=6379
+ # # Redis configuration
+ # - REDIS_HOST=redis
+ # - REDIS_PORT=6379
depends_on:
clickhouse:
condition: service_healthy
postgres:
condition: service_started
- redis:
- condition: service_started
+ # redis:
+ # condition: service_started
healthcheck:
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:3001/api/health"]
interval: 3s
@@ -132,3 +137,49 @@ volumes:
redis-data:
caddy_data: # Persistent volume for Caddy's certificates and state
caddy_config: # Persistent volume for Caddy's configuration cache (optional but good practice)
+
+configs:
+ clickhouse_network:
+ content: |
+ <clickhouse>
+ <listen_host>0.0.0.0</listen_host>
+ </clickhouse>
+
+ clickhouse_json:
+ content: |
+ <clickhouse>
+ <settings>
+ <enable_json_type>1</enable_json_type>
+ </settings>
+ </clickhouse>
+
+ clickhouse_logging:
+ content: |
+ <clickhouse>
+ <logger>
+ <level>warning</level>
+ <console>true</console>
+ </logger>
+ <query_thread_log remove="remove"/>
+ <query_log remove="remove"/>
+ <text_log remove="remove"/>
+ <trace_log remove="remove"/>
+ <metric_log remove="remove"/>
+ <asynchronous_metric_log remove="remove"/>
+ <session_log remove="remove"/>
+ <part_log remove="remove"/>
+ <latency_log remove="remove"/>
+ <processors_profile_log remove="remove"/>
+ </clickhouse>
+
+ clickhouse_user_logging:
+ content: |
+ <clickhouse>
+ <profiles>
+ <default>
+ <log_queries>0</log_queries>
+ <log_query_threads>0</log_query_threads>
+ <log_processors_profiles>0</log_processors_profiles>
+ </default>
+ </profiles>
+ </clickhouse>