point all clickhouse compoase files to base compose file with COORDIN…

…ATOR_HOST vars
Altinity · May 17, 2024 · d636eca · d636eca
1 parent f1e723d
commit d636eca
Show file tree

Hide file tree

Showing 71 changed files with 214 additions and 1,303 deletions.
diff --git a/aes_encryption/aes_encryption_env/clickhouse-service.yml b/aes_encryption/aes_encryption_env/clickhouse-service.yml
@@ -2,12 +2,9 @@ version: '2.3'
 
 services:
  clickhouse:
- image: altinityinfra/clickhouse-regression-multiarch:1.0
- init: true
- expose:
- - "9000"
- - "9009"
- - "8123"
+ extends:
+ file: ../../helpers/docker/clickhouse-service.yml
+ service: clickhouse
  volumes:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/logs.xml:/etc/clickhouse-server/config.d/logs.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/ports.xml:/etc/clickhouse-server/config.d/ports.xml"
@@ -19,16 +16,3 @@ services:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/common.xml:/etc/clickhouse-server/common.xml"
- - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
- - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
- entrypoint: bash -c "tail -f /dev/null"
- healthcheck:
- test: echo 1
- interval: 10s
- timeout: 10s
- retries: 3
- start_period: 300s
- cap_add:
- - SYS_PTRACE
- security_opt:
- - label:disable
diff --git a/aes_encryption/aes_encryption_env_arm64/clickhouse-service.yml b/aes_encryption/aes_encryption_env_arm64/clickhouse-service.yml
@@ -2,11 +2,9 @@ version: '2.3'
 
 services:
  clickhouse:
- image: altinityinfra/clickhouse-regression-multiarch:1.0
- expose:
- - "9000"
- - "9009"
- - "8123"
+ extends:
+ file: ../../helpers/docker/clickhouse-service.yml
+ service: clickhouse
  volumes:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/logs.xml:/etc/clickhouse-server/config.d/logs.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/ports.xml:/etc/clickhouse-server/config.d/ports.xml"
@@ -17,16 +15,4 @@ services:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/ssl:/etc/clickhouse-server/ssl"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
- - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
- - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
- entrypoint: bash -c "clickhouse server --config-file=/etc/clickhouse-server/config.xml --log-file=/var/log/clickhouse-server/clickhouse-server.log --errorlog-file=/var/log/clickhouse-server/clickhouse-server.err.log"
- healthcheck:
- test: clickhouse client --query='select 1'
- interval: 10s
- timeout: 10s
- retries: 10
- start_period: 300s
- cap_add:
- - SYS_PTRACE
- security_opt:
- - label:disable
+ - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/common.xml:/etc/clickhouse-server/common.xml"
diff --git a/aggregate_functions/aggregate_functions_env/clickhouse-service.yml b/aggregate_functions/aggregate_functions_env/clickhouse-service.yml
@@ -2,28 +2,13 @@ version: '2.3'
 
 services:
  clickhouse:
- image: altinityinfra/clickhouse-regression-multiarch:1.0
- expose:
- - "9000"
- - "9009"
- - "8123"
+ extends:
+ file: ../../helpers/docker/clickhouse-service.yml
+ service: clickhouse
  volumes:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/logs.xml:/etc/clickhouse-server/config.d/logs.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/remote.xml:/etc/clickhouse-server/config.d/remote.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/zookeeper.xml:/etc/clickhouse-server/config.d/zookeeper.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
- - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
- - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
- entrypoint: bash -c "clickhouse server --config-file=/etc/clickhouse-server/config.xml --log-file=/var/log/clickhouse-server/clickhouse-server.log --errorlog-file=/var/log/clickhouse-server/clickhouse-server.err.log"
- healthcheck:
- test: clickhouse client --query='select 1'
- interval: 10s
- timeout: 10s
- retries: 3
- start_period: 300s
- cap_add:
- - SYS_PTRACE
- security_opt:
- - label:disable
diff --git a/aggregate_functions/aggregate_functions_env_arm64/clickhouse-service.yml b/aggregate_functions/aggregate_functions_env_arm64/clickhouse-service.yml
@@ -2,28 +2,13 @@ version: '2.3'
 
 services:
  clickhouse:
- image: altinityinfra/clickhouse-regression-multiarch:1.0
- expose:
- - "9000"
- - "9009"
- - "8123"
+ extends:
+ file: ../../helpers/docker/clickhouse-service.yml
+ service: clickhouse
  volumes:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/logs.xml:/etc/clickhouse-server/config.d/logs.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/remote.xml:/etc/clickhouse-server/config.d/remote.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/zookeeper.xml:/etc/clickhouse-server/config.d/zookeeper.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
- - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
- - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
- entrypoint: bash -c "clickhouse server --config-file=/etc/clickhouse-server/config.xml --log-file=/var/log/clickhouse-server/clickhouse-server.log --errorlog-file=/var/log/clickhouse-server/clickhouse-server.err.log"
- healthcheck:
- test: clickhouse client --query='select 1'
- interval: 10s
- timeout: 10s
- retries: 3
- start_period: 300s
- cap_add:
- - SYS_PTRACE
- security_opt:
- - label:disable
diff --git a/alter/stress/stress_env/clickhouse-service.yml b/alter/stress/stress_env/clickhouse-service.yml
@@ -2,12 +2,9 @@ version: '2.3'
 
 services:
  clickhouse:
- image: altinityinfra/clickhouse-regression-multiarch:1.0
- init: true
- expose:
- - "9000"
- - "9009"
- - "8123"
+ extends:
+ file: ../../../helpers/docker/clickhouse-service.yml
+ service: clickhouse
  environment:
  - S3_AMAZON_KEY_ID=$S3_AMAZON_KEY_ID
  - S3_AMAZON_ACCESS_KEY=$S3_AMAZON_ACCESS_KEY
@@ -23,17 +20,6 @@ services:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/ssl:/etc/clickhouse-server/ssl"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
- - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
- - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
- entrypoint: bash -c "tail -f /dev/null"
- healthcheck:
- test: echo 1
- interval: 10s
- timeout: 10s
- retries: 3
- start_period: 300s
  cap_add:
- - SYS_PTRACE
  - NET_ADMIN
- security_opt:
- - label:disable
+
diff --git a/alter/stress/stress_env_arm64/clickhouse-service.yml b/alter/stress/stress_env_arm64/clickhouse-service.yml
@@ -2,12 +2,9 @@ version: '2.3'
 
 services:
  clickhouse:
- image: altinityinfra/clickhouse-regression-multiarch:1.0
- init: true
- expose:
- - "9000"
- - "9009"
- - "8123"
+ extends:
+ file: ../../../helpers/docker/clickhouse-service.yml
+ service: clickhouse
  environment:
  - S3_AMAZON_KEY_ID=$S3_AMAZON_KEY_ID
  - S3_AMAZON_ACCESS_KEY=$S3_AMAZON_ACCESS_KEY
@@ -23,17 +20,6 @@ services:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/ssl:/etc/clickhouse-server/ssl"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
- - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
- - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
- entrypoint: bash -c "tail -f /dev/null"
- healthcheck:
- test: echo 1
- interval: 10s
- timeout: 10s
- retries: 3
- start_period: 300s
  cap_add:
- - SYS_PTRACE
  - NET_ADMIN
- security_opt:
- - label:disable
+
diff --git a/atomic_insert/atomic_insert_env/clickhouse-service.yml b/atomic_insert/atomic_insert_env/clickhouse-service.yml
@@ -2,12 +2,9 @@ version: '2.3'
 
 services:
  clickhouse:
- image: altinityinfra/clickhouse-regression-multiarch:1.0
- init: true
- expose:
- - "9000"
- - "9009"
- - "8123"
+ extends:
+ file: ../../helpers/docker/clickhouse-service.yml
+ service: clickhouse
  volumes:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/logs.xml:/etc/clickhouse-server/config.d/logs.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
@@ -18,16 +15,3 @@ services:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/server.key:/etc/clickhouse-server/config.d/server.key"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
- - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
- - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
- entrypoint: bash -c "tail -f /dev/null"
- healthcheck:
- test: echo 1
- interval: 10s
- timeout: 10s
- retries: 3
- start_period: 300s
- cap_add:
- - SYS_PTRACE
- security_opt:
- - label:disable
diff --git a/atomic_insert/atomic_insert_env_arm64/clickhouse-service.yml b/atomic_insert/atomic_insert_env_arm64/clickhouse-service.yml
@@ -2,12 +2,9 @@ version: '2.3'
 
 services:
  clickhouse:
- image: altinityinfra/clickhouse-regression-multiarch:1.0
- init: true
- expose:
- - "9000"
- - "9009"
- - "8123"
+ extends:
+ file: ../../helpers/docker/clickhouse-service.yml
+ service: clickhouse
  volumes:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/logs.xml:/etc/clickhouse-server/config.d/logs.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
@@ -18,16 +15,3 @@ services:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/server.key:/etc/clickhouse-server/config.d/server.key"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
- - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
- - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
- entrypoint: bash -c "tail -f /dev/null"
- healthcheck:
- test: echo 1
- interval: 10s
- timeout: 10s
- retries: 3
- start_period: 300s
- cap_add:
- - SYS_PTRACE
- security_opt:
- - label:disable
diff --git a/attach/attach_env/clickhouse-service.yml b/attach/attach_env/clickhouse-service.yml
@@ -2,12 +2,9 @@ version: '2.3'
 
 services:
  clickhouse:
- image: altinityinfra/clickhouse-regression-multiarch:1.0
- init: true
- expose:
- - "9000"
- - "9009"
- - "8123"
+ extends:
+ file: ../../helpers/docker/clickhouse-service.yml
+ service: clickhouse
  volumes:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/instant_moves.xml:/etc/clickhouse-server/config.d/instant_moves.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/logs.xml:/etc/clickhouse-server/config.d/logs.xml"
@@ -18,17 +15,3 @@ services:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/ssl:/etc/clickhouse-server/ssl"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
- - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
- - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
- entrypoint: bash -c "tail -f /dev/null"
- healthcheck:
- test: echo 1
- interval: 10s
- timeout: 10s
- retries: 3
- start_period: 300s
- cap_add:
- - SYS_PTRACE
- - NET_ADMIN
- security_opt:
- - label:disable
diff --git a/attach/attach_env_arm64/clickhouse-service.yml b/attach/attach_env_arm64/clickhouse-service.yml
@@ -2,12 +2,9 @@ version: '2.3'
 
 services:
  clickhouse:
- image: altinityinfra/clickhouse-regression-multiarch:1.0
- init: true
- expose:
- - "9000"
- - "9009"
- - "8123"
+ extends:
+ file: ../../helpers/docker/clickhouse-service.yml
+ service: clickhouse
  volumes:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/instant_moves.xml:/etc/clickhouse-server/config.d/instant_moves.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/logs.xml:/etc/clickhouse-server/config.d/logs.xml"
@@ -18,17 +15,3 @@ services:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/ssl:/etc/clickhouse-server/ssl"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
- - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
- - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
- entrypoint: bash -c "tail -f /dev/null"
- healthcheck:
- test: echo 1
- interval: 10s
- timeout: 10s
- retries: 3
- start_period: 300s
- cap_add:
- - SYS_PTRACE
- - NET_ADMIN
- security_opt:
- - label:disable
diff --git a/base_58/base_58_env/clickhouse-service.yml b/base_58/base_58_env/clickhouse-service.yml
@@ -2,12 +2,9 @@ version: '2.3'
 
 services:
  clickhouse:
- image: altinityinfra/clickhouse-regression-multiarch:1.0
- init: true
- expose:
- - "9000"
- - "9009"
- - "8123"
+ extends:
+ file: ../../helpers/docker/clickhouse-service.yml
+ service: clickhouse
  volumes:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/logs.xml:/etc/clickhouse-server/config.d/logs.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/remote.xml:/etc/clickhouse-server/config.d/remote.xml"
@@ -16,16 +13,3 @@ services:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/zookeeper.xml:/etc/clickhouse-server/config.d/zookeeper.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
- - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
- - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
- entrypoint: bash -c "tail -f /dev/null"
- healthcheck:
- test: echo 1
- interval: 10s
- timeout: 10s
- retries: 3
- start_period: 300s
- cap_add:
- - SYS_PTRACE
- security_opt:
- - label:disable
diff --git a/base_58/base_58_env_arm64/clickhouse-service.yml b/base_58/base_58_env_arm64/clickhouse-service.yml
@@ -2,12 +2,9 @@ version: '2.3'
 
 services:
  clickhouse:
- image: altinityinfra/clickhouse-regression-multiarch:1.0
- init: true
- expose:
- - "9000"
- - "9009"
- - "8123"
+ extends:
+ file: ../../helpers/docker/clickhouse-service.yml
+ service: clickhouse
  volumes:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/logs.xml:/etc/clickhouse-server/config.d/logs.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/remote.xml:/etc/clickhouse-server/config.d/remote.xml"
@@ -16,16 +13,3 @@ services:
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/zookeeper.xml:/etc/clickhouse-server/config.d/zookeeper.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
  - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
- - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
- - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
- entrypoint: bash -c "tail -f /dev/null"
- healthcheck:
- test: echo 1
- interval: 10s
- timeout: 10s
- retries: 3
- start_period: 300s
- cap_add:
- - SYS_PTRACE
- security_opt:
- - label:disable