Merge branch 'master' of https://github.com/Kugelschieber/docker

2026-01-18 06:40:26 +00:00 · 2025-09-06 18:24:31 +02:00
parent 7d21bf48b0 5b635f5258
commit d007bc902d
1 changed files with 1 additions and 0 deletions
--- a/clickhouse/docker-compose.yml
+++ b/clickhouse/docker-compose.yml
@@ -5,6 +5,7 @@ volumes:

 services:
  clickhouse:
+<<<<<<< HEAD
    image: clickhouse/clickhouse-server:25.8-alpine
    container_name: clickhouse
    restart: unless-stopped