From f674cf4cf5eb0acc4b0030be4f72dcc53b9fbbd9 Mon Sep 17 00:00:00 2001 From: conorbros Date: Wed, 7 Sep 2022 10:25:49 +1000 Subject: [PATCH] use docker anchors --- .../docker-compose.yml | 31 ++------ .../cassandra-cluster-tls/docker-compose.yml | 6 +- .../docker-compose-cassandra-v3.yml | 6 +- .../docker-compose-cassandra-v4.yml | 6 +- .../redis-cluster-dr/docker-compose.yml | 74 +++++++------------ .../redis-cluster-handling/docker-compose.yml | 34 +++------ .../redis-cluster-hiding/docker-compose.yml | 34 +++------ .../docker-compose-with-key.yml | 28 +++---- .../redis-cluster-tls/docker-compose.yml | 28 +++---- .../redis-multi/docker-compose.yml | 8 +- .../docker-compose-3.11-cassandra.yaml | 4 +- .../docker-compose-4.0-cassandra.yaml | 4 +- .../redis-cluster-auth/docker-compose.yml | 36 ++++----- .../docker-compose.yml | 34 +++------ 14 files changed, 127 insertions(+), 206 deletions(-) diff --git a/shotover-proxy/example-configs/cassandra-cluster-multi-rack/docker-compose.yml b/shotover-proxy/example-configs/cassandra-cluster-multi-rack/docker-compose.yml index d40dbc999..46a5ec461 100644 --- a/shotover-proxy/example-configs/cassandra-cluster-multi-rack/docker-compose.yml +++ b/shotover-proxy/example-configs/cassandra-cluster-multi-rack/docker-compose.yml @@ -11,7 +11,7 @@ networks: services: cassandra-one: - image: bitnami/cassandra:4.0.6 + image: &image bitnami/cassandra:4.0.6 networks: cluster_subnet: ipv4_address: 172.16.1.2 @@ -22,10 +22,11 @@ services: timeout: 5s retries: 60 environment: + &environment CASSANDRA_SEEDS: "cassandra-one,cassandra-two" CASSANDRA_CLUSTER_NAME: TestCluster - CASSANDRA_DC: dc1 CASSANDRA_RACK: rack1 + CASSANDRA_DC: dc1 CASSANDRA_ENDPOINT_SNITCH: GossipingPropertyFileSnitch CASSANDRA_NUM_TOKENS: 128 MAX_HEAP_SIZE: "400M" @@ -35,39 +36,21 @@ services: CASSANDRA_ENABLE_USER_DEFINED_FUNCTIONS: "true" cassandra-two: - image: bitnami/cassandra:4.0.6 + image: *image networks: cluster_subnet: ipv4_address: 172.16.1.3 healthcheck: *healthcheck environment: - CASSANDRA_SEEDS: "cassandra-one,cassandra-two" - CASSANDRA_CLUSTER_NAME: TestCluster - CASSANDRA_DC: dc1 + <<: *environment CASSANDRA_RACK: rack2 - CASSANDRA_ENDPOINT_SNITCH: GossipingPropertyFileSnitch - CASSANDRA_NUM_TOKENS: 128 - MAX_HEAP_SIZE: "400M" - MIN_HEAP_SIZE: "400M" - HEAP_NEWSIZE: "48M" - CASSANDRA_ENABLE_SCRIPTED_USER_DEFINED_FUNCTIONS: "true" - CASSANDRA_ENABLE_USER_DEFINED_FUNCTIONS: "true" cassandra-three: - image: bitnami/cassandra:4.0.6 + image: *image networks: cluster_subnet: ipv4_address: 172.16.1.4 healthcheck: *healthcheck environment: - CASSANDRA_SEEDS: "cassandra-one,cassandra-two" - CASSANDRA_CLUSTER_NAME: TestCluster - CASSANDRA_DC: dc1 + <<: *environment CASSANDRA_RACK: rack3 - CASSANDRA_ENDPOINT_SNITCH: GossipingPropertyFileSnitch - CASSANDRA_NUM_TOKENS: 128 - MAX_HEAP_SIZE: "400M" - MIN_HEAP_SIZE: "400M" - HEAP_NEWSIZE: "48M" - CASSANDRA_ENABLE_SCRIPTED_USER_DEFINED_FUNCTIONS: "true" - CASSANDRA_ENABLE_USER_DEFINED_FUNCTIONS: "true" diff --git a/shotover-proxy/example-configs/cassandra-cluster-tls/docker-compose.yml b/shotover-proxy/example-configs/cassandra-cluster-tls/docker-compose.yml index 13bc0f042..0164690ee 100644 --- a/shotover-proxy/example-configs/cassandra-cluster-tls/docker-compose.yml +++ b/shotover-proxy/example-configs/cassandra-cluster-tls/docker-compose.yml @@ -11,7 +11,7 @@ networks: services: cassandra-one: - image: bitnami/cassandra:4.0.6 + image: &image bitnami/cassandra:4.0.6 networks: cluster_subnet: ipv4_address: 172.16.1.2 @@ -43,7 +43,7 @@ services: - ../cassandra-tls/certs/truststore.p12:/bitnami/cassandra/secrets/truststore cassandra-two: - image: bitnami/cassandra:4.0.6 + image: *image networks: cluster_subnet: ipv4_address: 172.16.1.3 @@ -52,7 +52,7 @@ services: volumes: *volumes cassandra-three: - image: bitnami/cassandra:4.0.6 + image: *image networks: cluster_subnet: ipv4_address: 172.16.1.4 diff --git a/shotover-proxy/example-configs/cassandra-cluster/docker-compose-cassandra-v3.yml b/shotover-proxy/example-configs/cassandra-cluster/docker-compose-cassandra-v3.yml index 484ee77af..f70f0f206 100644 --- a/shotover-proxy/example-configs/cassandra-cluster/docker-compose-cassandra-v3.yml +++ b/shotover-proxy/example-configs/cassandra-cluster/docker-compose-cassandra-v3.yml @@ -11,7 +11,7 @@ networks: services: cassandra-one: - image: bitnami/cassandra:3.11 + image: &image bitnami/cassandra:3.11 networks: cluster_subnet: ipv4_address: 172.16.1.2 @@ -36,7 +36,7 @@ services: CASSANDRA_ENABLE_USER_DEFINED_FUNCTIONS: "true" cassandra-two: - image: bitnami/cassandra:3.11 + image: *image networks: cluster_subnet: ipv4_address: 172.16.1.3 @@ -44,7 +44,7 @@ services: environment: *environment cassandra-three: - image: bitnami/cassandra:3.11 + image: *image networks: cluster_subnet: ipv4_address: 172.16.1.4 diff --git a/shotover-proxy/example-configs/cassandra-cluster/docker-compose-cassandra-v4.yml b/shotover-proxy/example-configs/cassandra-cluster/docker-compose-cassandra-v4.yml index 4dd636ce9..1ee755745 100644 --- a/shotover-proxy/example-configs/cassandra-cluster/docker-compose-cassandra-v4.yml +++ b/shotover-proxy/example-configs/cassandra-cluster/docker-compose-cassandra-v4.yml @@ -11,7 +11,7 @@ networks: services: cassandra-one: - image: bitnami/cassandra:4.0.6 + image: &image bitnami/cassandra:4.0.6 networks: cluster_subnet: ipv4_address: 172.16.1.2 @@ -36,7 +36,7 @@ services: CASSANDRA_ENABLE_USER_DEFINED_FUNCTIONS: "true" cassandra-two: - image: bitnami/cassandra:4.0.6 + image: *image networks: cluster_subnet: ipv4_address: 172.16.1.3 @@ -44,7 +44,7 @@ services: environment: *environment cassandra-three: - image: bitnami/cassandra:4.0.6 + image: *image networks: cluster_subnet: ipv4_address: 172.16.1.4 diff --git a/shotover-proxy/example-configs/redis-cluster-dr/docker-compose.yml b/shotover-proxy/example-configs/redis-cluster-dr/docker-compose.yml index 4f2628b6a..2c61304da 100644 --- a/shotover-proxy/example-configs/redis-cluster-dr/docker-compose.yml +++ b/shotover-proxy/example-configs/redis-cluster-dr/docker-compose.yml @@ -1,67 +1,57 @@ version: '3.3' services: redis-node-0: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: &image docker.io/bitnami/redis-cluster:6.0-debian-10 ports: - "2220:6379" volumes: - redis-cluster_data-0:/bitnami/redis/data - environment: + environment: &environment - 'REDIS_PASSWORD=shotover' - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' redis-node-1: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2221:6379" volumes: - redis-cluster_data-1:/bitnami/redis/data - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-2: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2222:6379" volumes: - redis-cluster_data-2:/bitnami/redis/data - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-3: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2223:6379" volumes: - redis-cluster_data-3:/bitnami/redis/data - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-4: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2224:6379" volumes: - redis-cluster_data-4:/bitnami/redis/data - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-5: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2225:6379" volumes: - redis-cluster_data-5:/bitnami/redis/data - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-cluster-init: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image depends_on: - redis-node-0 - redis-node-1 @@ -77,67 +67,55 @@ services: - 'REDIS_CLUSTER_CREATOR=yes' redis-node-0-dr: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2120:6379" volumes: - redis-cluster_data-0-dr:/bitnami/redis/data - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0-dr redis-node-1-dr redis-node-2-dr redis-node-3-dr redis-node-4-dr redis-node-5-dr' + environment: *environment redis-node-1-dr: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2121:6379" volumes: - redis-cluster_data-1-dr:/bitnami/redis/data - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0-dr redis-node-1-dr redis-node-2-dr redis-node-3-dr redis-node-4-dr redis-node-5-dr' + environment: *environment redis-node-2-dr: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2122:6379" volumes: - redis-cluster_data-2-dr:/bitnami/redis/data - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0-dr redis-node-1-dr redis-node-2-dr redis-node-3-dr redis-node-4-dr redis-node-5-dr' + environment: *environment redis-node-3-dr: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2123:6379" volumes: - redis-cluster_data-3-dr:/bitnami/redis/data - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0-dr redis-node-1-dr redis-node-2-dr redis-node-3-dr redis-node-4-dr redis-node-5-dr' + environment: *environment redis-node-4-dr: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2124:6379" volumes: - redis-cluster_data-4-dr:/bitnami/redis/data - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0-dr redis-node-1-dr redis-node-2-dr redis-node-3-dr redis-node-4-dr redis-node-5-dr' + environment: *environment redis-node-5-dr: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2125:6379" volumes: - redis-cluster_data-5-dr:/bitnami/redis/data - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0-dr redis-node-1-dr redis-node-2-dr redis-node-3-dr redis-node-4-dr redis-node-5-dr' + environment: *environment redis-cluster-init-dr: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image depends_on: - redis-node-0-dr - redis-node-1-dr diff --git a/shotover-proxy/example-configs/redis-cluster-handling/docker-compose.yml b/shotover-proxy/example-configs/redis-cluster-handling/docker-compose.yml index 956824a83..c3889f559 100644 --- a/shotover-proxy/example-configs/redis-cluster-handling/docker-compose.yml +++ b/shotover-proxy/example-configs/redis-cluster-handling/docker-compose.yml @@ -1,64 +1,54 @@ version: '3.3' services: redis-node-0: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: &image docker.io/bitnami/redis-cluster:6.0-debian-10 ports: - "2220:6379" volumes: - redis-cluster_data-0:/bitnami/redis/data - environment: + environment: &environment - 'ALLOW_EMPTY_PASSWORD=yes' - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' redis-node-1: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2221:6379" volumes: - redis-cluster_data-1:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-2: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2222:6379" volumes: - redis-cluster_data-2:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-3: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2223:6379" volumes: - redis-cluster_data-3:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-4: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2224:6379" volumes: - redis-cluster_data-4:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-5: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2225:6379" volumes: - redis-cluster_data-5:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-cluster-init: image: docker.io/bitnami/redis-cluster:6.0-debian-10 diff --git a/shotover-proxy/example-configs/redis-cluster-hiding/docker-compose.yml b/shotover-proxy/example-configs/redis-cluster-hiding/docker-compose.yml index 956824a83..c3889f559 100644 --- a/shotover-proxy/example-configs/redis-cluster-hiding/docker-compose.yml +++ b/shotover-proxy/example-configs/redis-cluster-hiding/docker-compose.yml @@ -1,64 +1,54 @@ version: '3.3' services: redis-node-0: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: &image docker.io/bitnami/redis-cluster:6.0-debian-10 ports: - "2220:6379" volumes: - redis-cluster_data-0:/bitnami/redis/data - environment: + environment: &environment - 'ALLOW_EMPTY_PASSWORD=yes' - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' redis-node-1: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2221:6379" volumes: - redis-cluster_data-1:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-2: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2222:6379" volumes: - redis-cluster_data-2:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-3: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2223:6379" volumes: - redis-cluster_data-3:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-4: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2224:6379" volumes: - redis-cluster_data-4:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-5: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2225:6379" volumes: - redis-cluster_data-5:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-cluster-init: image: docker.io/bitnami/redis-cluster:6.0-debian-10 diff --git a/shotover-proxy/example-configs/redis-cluster-tls/docker-compose-with-key.yml b/shotover-proxy/example-configs/redis-cluster-tls/docker-compose-with-key.yml index 447fbe71c..68a4fb3f4 100644 --- a/shotover-proxy/example-configs/redis-cluster-tls/docker-compose-with-key.yml +++ b/shotover-proxy/example-configs/redis-cluster-tls/docker-compose-with-key.yml @@ -1,12 +1,12 @@ version: '3.3' services: redis-node-0: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: &image docker.io/bitnami/redis-cluster:6.0-debian-10 ports: - "2220:6379" volumes: - redis-cluster_data-0:/bitnami/redis/data - - ../redis-tls/certs:/usr/local/etc/redis/certs + - &keys ../redis-tls/certs:/usr/local/etc/redis/certs environment: &node_environment - 'ALLOW_EMPTY_PASSWORD=yes' @@ -19,52 +19,52 @@ services: - 'REDIS_TLS_AUTH_CLIENTS=yes' redis-node-1: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2221:6379" volumes: - redis-cluster_data-1:/bitnami/redis/data - - ./../redis-tls/certs:/usr/local/etc/redis/certs + - *keys environment: *node_environment redis-node-2: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2222:6379" volumes: - redis-cluster_data-2:/bitnami/redis/data - - ./../redis-tls/certs:/usr/local/etc/redis/certs + - *keys environment: *node_environment redis-node-3: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2223:6379" volumes: - redis-cluster_data-3:/bitnami/redis/data - - ./../redis-tls/certs:/usr/local/etc/redis/certs + - *keys environment: *node_environment redis-node-4: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2224:6379" volumes: - redis-cluster_data-4:/bitnami/redis/data - - ./../redis-tls/certs:/usr/local/etc/redis/certs + - *keys environment: *node_environment redis-node-5: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2225:6379" volumes: - redis-cluster_data-5:/bitnami/redis/data - - ./../redis-tls/certs:/usr/local/etc/redis/certs + - *keys environment: *node_environment redis-cluster-init: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image depends_on: - redis-node-0 - redis-node-1 @@ -73,7 +73,7 @@ services: - redis-node-4 - redis-node-5 volumes: - - ./../redis-tls/certs:/usr/local/etc/redis/certs + - *keys environment: - 'REDIS_CLUSTER_REPLICAS=1' - 'REDIS_CLUSTER_CREATOR=yes' diff --git a/shotover-proxy/example-configs/redis-cluster-tls/docker-compose.yml b/shotover-proxy/example-configs/redis-cluster-tls/docker-compose.yml index a1904129c..cdfab5a81 100644 --- a/shotover-proxy/example-configs/redis-cluster-tls/docker-compose.yml +++ b/shotover-proxy/example-configs/redis-cluster-tls/docker-compose.yml @@ -1,12 +1,12 @@ version: '3.3' services: redis-node-0: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: &image docker.io/bitnami/redis-cluster:6.0-debian-10 ports: - "2220:6379" volumes: - redis-cluster_data-0:/bitnami/redis/data - - ../redis-tls/certs:/usr/local/etc/redis/certs + - &keys ../redis-tls/certs:/usr/local/etc/redis/certs environment: &node_environment - 'ALLOW_EMPTY_PASSWORD=yes' @@ -19,52 +19,52 @@ services: - 'REDIS_TLS_AUTH_CLIENTS=no' redis-node-1: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2221:6379" volumes: - redis-cluster_data-1:/bitnami/redis/data - - ./../redis-tls/certs:/usr/local/etc/redis/certs + - *keys environment: *node_environment redis-node-2: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2222:6379" volumes: - redis-cluster_data-2:/bitnami/redis/data - - ./../redis-tls/certs:/usr/local/etc/redis/certs + - *keys environment: *node_environment redis-node-3: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2223:6379" volumes: - redis-cluster_data-3:/bitnami/redis/data - - ./../redis-tls/certs:/usr/local/etc/redis/certs + - *keys environment: *node_environment redis-node-4: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2224:6379" volumes: - redis-cluster_data-4:/bitnami/redis/data - - ./../redis-tls/certs:/usr/local/etc/redis/certs + - *keys environment: *node_environment redis-node-5: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2225:6379" volumes: - redis-cluster_data-5:/bitnami/redis/data - - ./../redis-tls/certs:/usr/local/etc/redis/certs + - *keys environment: *node_environment redis-cluster-init: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image depends_on: - redis-node-0 - redis-node-1 @@ -73,7 +73,7 @@ services: - redis-node-4 - redis-node-5 volumes: - - ./../redis-tls/certs:/usr/local/etc/redis/certs + - *keys environment: - 'REDIS_CLUSTER_REPLICAS=1' - 'REDIS_CLUSTER_CREATOR=yes' diff --git a/shotover-proxy/example-configs/redis-multi/docker-compose.yml b/shotover-proxy/example-configs/redis-multi/docker-compose.yml index 9cbb47b1f..314017417 100644 --- a/shotover-proxy/example-configs/redis-multi/docker-compose.yml +++ b/shotover-proxy/example-configs/redis-multi/docker-compose.yml @@ -1,14 +1,14 @@ version: "3.3" services: redis-one: - image: library/redis:5.0.9 + image: &image library/redis:5.0.9 ports: - "3331:6379" redis-two: - image: library/redis:5.0.9 + image: *image ports: - "3332:6379" redis-three: - image: library/redis:5.0.9 + image: *image ports: - - "3333:6379" \ No newline at end of file + - "3333:6379" diff --git a/shotover-proxy/tests/test-configs/cassandra-peers-rewrite/docker-compose-3.11-cassandra.yaml b/shotover-proxy/tests/test-configs/cassandra-peers-rewrite/docker-compose-3.11-cassandra.yaml index 1caa5cbf5..ab4735b42 100644 --- a/shotover-proxy/tests/test-configs/cassandra-peers-rewrite/docker-compose-3.11-cassandra.yaml +++ b/shotover-proxy/tests/test-configs/cassandra-peers-rewrite/docker-compose-3.11-cassandra.yaml @@ -11,7 +11,7 @@ networks: services: cassandra-one: - image: bitnami/cassandra:3.11 + image: &image bitnami/cassandra:3.11 networks: cluster_subnet: ipv4_address: 172.16.1.2 @@ -36,7 +36,7 @@ services: CASSANDRA_ENABLE_USER_DEFINED_FUNCTIONS: "true" cassandra-two: - image: bitnami/cassandra:3.11 + image: *image networks: cluster_subnet: ipv4_address: 172.16.1.3 diff --git a/shotover-proxy/tests/test-configs/cassandra-peers-rewrite/docker-compose-4.0-cassandra.yaml b/shotover-proxy/tests/test-configs/cassandra-peers-rewrite/docker-compose-4.0-cassandra.yaml index 3629e8301..0d7ed1124 100644 --- a/shotover-proxy/tests/test-configs/cassandra-peers-rewrite/docker-compose-4.0-cassandra.yaml +++ b/shotover-proxy/tests/test-configs/cassandra-peers-rewrite/docker-compose-4.0-cassandra.yaml @@ -11,7 +11,7 @@ networks: services: cassandra-one: - image: bitnami/cassandra:4.0.6 + image: &image bitnami/cassandra:4.0.6 networks: cluster_subnet: ipv4_address: 172.16.1.2 @@ -36,7 +36,7 @@ services: CASSANDRA_ENABLE_USER_DEFINED_FUNCTIONS: "true" cassandra-two: - image: bitnami/cassandra:4.0.6 + image: *image networks: cluster_subnet: ipv4_address: 172.16.1.3 diff --git a/shotover-proxy/tests/test-configs/redis-cluster-auth/docker-compose.yml b/shotover-proxy/tests/test-configs/redis-cluster-auth/docker-compose.yml index 127943df6..9865f33ec 100644 --- a/shotover-proxy/tests/test-configs/redis-cluster-auth/docker-compose.yml +++ b/shotover-proxy/tests/test-configs/redis-cluster-auth/docker-compose.yml @@ -1,55 +1,45 @@ version: '3.3' services: redis-node-0: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: &image docker.io/bitnami/redis-cluster:6.0-debian-10 ports: - "2230:6379" - environment: + environment: &environment - 'REDIS_PASSWORD=shotover' - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' redis-node-1: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2231:6379" - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-2: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2232:6379" - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-3: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2233:6379" - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-4: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2234:6379" - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-5: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2235:6379" - environment: - - 'REDIS_PASSWORD=shotover' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-cluster-init: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image depends_on: - redis-node-0 - redis-node-1 diff --git a/shotover-proxy/tests/test-configs/redis-cluster-ports-rewrite/docker-compose.yml b/shotover-proxy/tests/test-configs/redis-cluster-ports-rewrite/docker-compose.yml index 956824a83..c3889f559 100644 --- a/shotover-proxy/tests/test-configs/redis-cluster-ports-rewrite/docker-compose.yml +++ b/shotover-proxy/tests/test-configs/redis-cluster-ports-rewrite/docker-compose.yml @@ -1,64 +1,54 @@ version: '3.3' services: redis-node-0: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: &image docker.io/bitnami/redis-cluster:6.0-debian-10 ports: - "2220:6379" volumes: - redis-cluster_data-0:/bitnami/redis/data - environment: + environment: &environment - 'ALLOW_EMPTY_PASSWORD=yes' - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' redis-node-1: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2221:6379" volumes: - redis-cluster_data-1:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-2: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2222:6379" volumes: - redis-cluster_data-2:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-3: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2223:6379" volumes: - redis-cluster_data-3:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-4: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2224:6379" volumes: - redis-cluster_data-4:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-node-5: - image: docker.io/bitnami/redis-cluster:6.0-debian-10 + image: *image ports: - "2225:6379" volumes: - redis-cluster_data-5:/bitnami/redis/data - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' + environment: *environment redis-cluster-init: image: docker.io/bitnami/redis-cluster:6.0-debian-10