use docker anchors (#791)

shotover · Sep 8, 2022 · 10174bf · 10174bf
1 parent 1c31882
commit 10174bf
Show file tree

Hide file tree

Showing 14 changed files with 127 additions and 204 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
@@ -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
@@ -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
@@ -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,15 +36,15 @@ 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
     healthcheck: *healthcheck
     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
@@ -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,15 +36,15 @@ 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: *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
@@ -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: &node-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: *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
-    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: *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
-    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: *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
-    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: *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
-    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: *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
@@ -77,67 +67,57 @@ 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:
+    environment: &dr-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'
 
   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: *dr-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: *dr-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: *dr-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: *dr-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: *dr-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
@@ -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