Merge branch 'clickhouse'

clickhouse/docker-compose-old.yaml

@@ -2,14 +2,10 @@ services:
   clickhouse-keeper1:
     image: clickhouse/clickhouse-server:latest
     container_name: clickhouse-keeper1
-    command: >
-      /usr/bin/clickhouse-keeper --config-file=/etc/clickhouse-server/config.xml
+    command: /usr/bin/clickhouse-keeper --config-file=/etc/clickhouse-server/config.xml
     volumes:
       - ./clickhouse_keeper/keeper1-config.xml:/etc/clickhouse-server/config.xml
-      - ./clickhouse_data/data:/var/lib/clickhouse/data
-      - ./clickhouse_data/tmp:/var/lib/clickhouse/tmp
-      - ./clickhouse_data/user_files:/var/lib/clickhouse/user_files
-      - ./clickhouse_data/format_schemas:/var/lib/clickhouse/format_schemas
+      - clickhouse_keeper1_data:/var/lib/clickhouse
 
     networks:
       clickhouse-keeper-network:
@@ -19,15 +15,10 @@ services:
   clickhouse-keeper2:
     image: clickhouse/clickhouse-server:latest
     container_name: clickhouse-keeper2
-    command: >
-      /usr/bin/clickhouse-keeper --config-file=/etc/clickhouse-server/config.xml
+    command: /usr/bin/clickhouse-keeper --config-file=/etc/clickhouse-server/config.xml
     volumes:
       - ./clickhouse_keeper/keeper2-config.xml:/etc/clickhouse-server/config.xml
-      - ./clickhouse_data/data:/var/lib/clickhouse/data
-      - ./clickhouse_data/tmp:/var/lib/clickhouse/tmp
-      - ./clickhouse_data/user_files:/var/lib/clickhouse/user_files
-      - ./clickhouse_data/format_schemas:/var/lib/clickhouse/format_schemas
-
+      - clickhouse_keeper2_data:/var/lib/clickhouse
     networks:
       clickhouse-keeper-network:
         aliases:
@@ -36,15 +27,10 @@ services:
   clickhouse-keeper3:
     image: clickhouse/clickhouse-server:latest
     container_name: clickhouse-keeper3
-    command: >
-      /usr/bin/clickhouse-keeper --config-file=/etc/clickhouse-server/config.xml
+    command: /usr/bin/clickhouse-keeper --config-file=/etc/clickhouse-server/config.xml
     volumes:
       - ./clickhouse_keeper/keeper3-config.xml:/etc/clickhouse-server/config.xml
-      - ./clickhouse_data/data:/var/lib/clickhouse/data
-      - ./clickhouse_data/tmp:/var/lib/clickhouse/tmp
-      - ./clickhouse_data/user_files:/var/lib/clickhouse/user_files
-      - ./clickhouse_data/format_schemas:/var/lib/clickhouse/format_schemas
-
+      - clickhouse_keeper3_data:/var/lib/clickhouse
     networks:
       clickhouse-keeper-network:
         aliases:
@@ -55,7 +41,8 @@ services:
     container_name: clickhouse-server1
     volumes:
       - ./node1-config/:/etc/clickhouse-server/config.d/
-      - clickhouse_data1:/var/lib/clickhouse
+      - clickhouse_server1_data:/var/lib/clickhouse
+      - clickhouse_server1_TTL:/clickhouse_data/server1
     networks:
       clickhouse-server-network:
         aliases:
@@ -69,10 +56,10 @@ services:
       #   constraints: [node.labels.role == server]
       update_config:
         delay: 10s
-      # resources:
-      #   limits:
-      #     cpus: "0.50"
-      #     memory: 100M
+      resources:
+        limits:
+          cpus: "0.50"
+          memory: 1200M
     depends_on:
       - clickhouse-keeper1
       - clickhouse-keeper2
@@ -86,7 +73,8 @@ services:
     container_name: clickhouse-server2
     volumes:
       - ./node2-config/:/etc/clickhouse-server/config.d/
-      - clickhouse_data2:/var/lib/clickhouse
+      - clickhouse_server2_data:/var/lib/clickhouse
+      - clickhouse_server2_TTL:/clickhouse_data/server2
     networks:
       clickhouse-server-network:
         aliases:
@@ -100,10 +88,10 @@ services:
       #   constraints: [node.labels.role == server]
       update_config:
         delay: 10s
-      # resources:
-      #   limits:
-      #     cpus: "0.50"
-      #     memory: 100M
+      resources:
+        limits:
+          cpus: "0.50"
+          memory: 1200M
     depends_on:
       - clickhouse-keeper1
       - clickhouse-keeper2
@@ -115,11 +103,23 @@ services:
 networks:
   clickhouse-server-network:
     driver: overlay
+    attachable: true
   clickhouse-keeper-network:
     driver: overlay
+    attachable: true
 
 volumes:
-  clickhouse_data1:
+  clickhouse_server1_data:
     driver: local
-  clickhouse_data2:
+  clickhouse_server2_data:
+    driver: local
+  clickhouse_keeper1_data:
+    driver: local
+  clickhouse_keeper2_data:
+    driver: local
+  clickhouse_keeper3_data:
+    driver: local
+  clickhouse_server1_TTL:
+    driver: local
+  clickhouse_server2_TTL:
     driver: local