From a10119f9513e39cf3cc5ea4209869d4f6644d737 Mon Sep 17 00:00:00 2001 From: Lucas Kent Date: Tue, 2 Apr 2024 21:46:19 +1100 Subject: [PATCH] Remove version field from all docker-compose.yaml (#1557) --- custom-transforms-example/config/docker-compose.yaml | 5 ++--- docs/src/examples/redis-clustering-unaware.md | 1 - .../test-configs/cassandra/cassandra-5/docker-compose.yaml | 1 - .../cluster-multi-rack-2-per-rack/docker-compose.yaml | 1 - .../cassandra/cluster-multi-rack/docker-compose.yaml | 1 - .../test-configs/cassandra/cluster-tls/docker-compose.yaml | 1 - .../test-configs/cassandra/cluster-v3/docker-compose.yaml | 1 - .../test-configs/cassandra/cluster-v4/docker-compose.yaml | 1 - .../test-configs/cassandra/cluster-v5/docker-compose.yaml | 1 - .../passthrough-parse-request/docker-compose.yaml | 1 - .../passthrough-parse-response/docker-compose.yaml | 1 - .../passthrough-websocket-tls/docker-compose.yaml | 1 - .../cassandra/passthrough-websocket/docker-compose.yaml | 1 - .../test-configs/cassandra/passthrough/docker-compose.yaml | 1 - .../peers-rewrite/docker-compose-3.11-cassandra.yaml | 1 - .../peers-rewrite/docker-compose-4.0-cassandra.yaml | 1 - .../test-configs/cassandra/protect-aws/docker-compose.yaml | 1 - .../cassandra/protect-local/docker-compose.yaml | 1 - .../test-configs/cassandra/redis-cache/docker-compose.yaml | 1 - .../cassandra/request-throttling/docker-compose.yaml | 1 - .../tests/test-configs/cassandra/tls/docker-compose.yaml | 1 - .../tests/test-configs/kafka/bench/docker-compose.yaml | 1 - .../test-configs/kafka/cluster-1-rack/docker-compose.yaml | 1 - .../test-configs/kafka/cluster-2-racks/docker-compose.yaml | 1 - .../test-configs/kafka/cluster-sasl/docker-compose.yaml | 2 -- .../test-configs/kafka/cluster-tls/docker-compose.yaml | 1 - .../kafka/passthrough-sasl/docker-compose.yaml | 3 --- .../test-configs/kafka/passthrough-tls/docker-compose.yaml | 1 - .../test-configs/kafka/passthrough/docker-compose.yaml | 1 - .../tests/test-configs/log-to-file/docker-compose.yaml | 1 - .../opensearch-passthrough/docker-compose.yaml | 2 -- .../test-configs/redis/cluster-auth/docker-compose.yaml | 4 +--- .../test-configs/redis/cluster-dr/docker-compose.yaml | 7 ++----- .../redis/cluster-handling/docker-compose.yaml | 4 +--- .../test-configs/redis/cluster-hiding/docker-compose.yaml | 4 +--- .../redis/cluster-ports-rewrite/docker-compose.yaml | 4 +--- .../test-configs/redis/cluster-tls/docker-compose.yaml | 4 +--- .../tests/test-configs/redis/multi/docker-compose.yaml | 1 - .../test-configs/redis/passthrough/docker-compose.yaml | 5 ++--- .../redis/tls-no-client-auth/docker-compose.yaml | 1 - .../redis/tls-no-verify-hostname/docker-compose.yaml | 1 - .../tests/test-configs/redis/tls/docker-compose.yaml | 1 - shotover-proxy/tests/transforms/docker-compose-moto.yaml | 1 - 43 files changed, 11 insertions(+), 65 deletions(-) diff --git a/custom-transforms-example/config/docker-compose.yaml b/custom-transforms-example/config/docker-compose.yaml index b3fe44edb..24483c51f 100644 --- a/custom-transforms-example/config/docker-compose.yaml +++ b/custom-transforms-example/config/docker-compose.yaml @@ -1,9 +1,8 @@ -version: "3.3" services: redis-one: image: library/redis:5.0.9 ports: - "1111:6379" volumes: - - ./redis.conf:/usr/local/etc/redis/redis.conf - command: ["redis-server", "/usr/local/etc/redis/redis.conf"] + - ./redis.conf:/usr/local/etc/redis/redis.conf + command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ] diff --git a/docs/src/examples/redis-clustering-unaware.md b/docs/src/examples/redis-clustering-unaware.md index 2bb5c1810..e80498caf 100644 --- a/docs/src/examples/redis-clustering-unaware.md +++ b/docs/src/examples/redis-clustering-unaware.md @@ -20,7 +20,6 @@ This more accurately reflects a real production use but will take a bit more set And reduce the docker-compose.yaml to just the shotover part ```yaml -version: '3.3' services: shotover-0: networks: diff --git a/shotover-proxy/tests/test-configs/cassandra/cassandra-5/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/cassandra-5/docker-compose.yaml index a2fcaf055..036378557 100644 --- a/shotover-proxy/tests/test-configs/cassandra/cassandra-5/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/cassandra-5/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: cassandra-one: image: shotover/cassandra-test:5.0-beta1-r2 diff --git a/shotover-proxy/tests/test-configs/cassandra/cluster-multi-rack-2-per-rack/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/cluster-multi-rack-2-per-rack/docker-compose.yaml index 54c06a6e9..b7b922ceb 100644 --- a/shotover-proxy/tests/test-configs/cassandra/cluster-multi-rack-2-per-rack/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/cluster-multi-rack-2-per-rack/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" networks: cluster_subnet: name: cluster_subnet diff --git a/shotover-proxy/tests/test-configs/cassandra/cluster-multi-rack/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/cluster-multi-rack/docker-compose.yaml index 0167f306c..9953bdc04 100644 --- a/shotover-proxy/tests/test-configs/cassandra/cluster-multi-rack/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/cluster-multi-rack/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" networks: cluster_subnet: name: cluster_subnet diff --git a/shotover-proxy/tests/test-configs/cassandra/cluster-tls/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/cluster-tls/docker-compose.yaml index efe47f6f7..0b1b07e40 100644 --- a/shotover-proxy/tests/test-configs/cassandra/cluster-tls/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/cluster-tls/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" networks: cluster_subnet: name: cluster_subnet diff --git a/shotover-proxy/tests/test-configs/cassandra/cluster-v3/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/cluster-v3/docker-compose.yaml index e0d767a3d..b1f9922c3 100644 --- a/shotover-proxy/tests/test-configs/cassandra/cluster-v3/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/cluster-v3/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" networks: cluster_subnet: name: cluster_subnet diff --git a/shotover-proxy/tests/test-configs/cassandra/cluster-v4/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/cluster-v4/docker-compose.yaml index 61893d544..2e84a15bc 100644 --- a/shotover-proxy/tests/test-configs/cassandra/cluster-v4/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/cluster-v4/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" networks: cluster_subnet: name: cluster_subnet diff --git a/shotover-proxy/tests/test-configs/cassandra/cluster-v5/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/cluster-v5/docker-compose.yaml index 7cd1f3b93..2d50c5d45 100644 --- a/shotover-proxy/tests/test-configs/cassandra/cluster-v5/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/cluster-v5/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" networks: cluster_subnet: name: cluster_subnet diff --git a/shotover-proxy/tests/test-configs/cassandra/passthrough-parse-request/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/passthrough-parse-request/docker-compose.yaml index a4308021b..b970935e5 100644 --- a/shotover-proxy/tests/test-configs/cassandra/passthrough-parse-request/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/passthrough-parse-request/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: cassandra-one: image: shotover/cassandra-test:4.0.6-r1 diff --git a/shotover-proxy/tests/test-configs/cassandra/passthrough-parse-response/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/passthrough-parse-response/docker-compose.yaml index a4308021b..b970935e5 100644 --- a/shotover-proxy/tests/test-configs/cassandra/passthrough-parse-response/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/passthrough-parse-response/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: cassandra-one: image: shotover/cassandra-test:4.0.6-r1 diff --git a/shotover-proxy/tests/test-configs/cassandra/passthrough-websocket-tls/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/passthrough-websocket-tls/docker-compose.yaml index a70e24635..b8d91a065 100644 --- a/shotover-proxy/tests/test-configs/cassandra/passthrough-websocket-tls/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/passthrough-websocket-tls/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: cassandra-one: image: shotover/cassandra-test:4.0.6-r1 diff --git a/shotover-proxy/tests/test-configs/cassandra/passthrough-websocket/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/passthrough-websocket/docker-compose.yaml index a4308021b..b970935e5 100644 --- a/shotover-proxy/tests/test-configs/cassandra/passthrough-websocket/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/passthrough-websocket/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: cassandra-one: image: shotover/cassandra-test:4.0.6-r1 diff --git a/shotover-proxy/tests/test-configs/cassandra/passthrough/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/passthrough/docker-compose.yaml index a4308021b..b970935e5 100644 --- a/shotover-proxy/tests/test-configs/cassandra/passthrough/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/passthrough/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: cassandra-one: image: shotover/cassandra-test:4.0.6-r1 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 72f55867b..83938a784 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 @@ -1,4 +1,3 @@ -version: "3.3" networks: cluster_subnet: name: cluster_subnet 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 92078aea8..59e771953 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 @@ -1,4 +1,3 @@ -version: "3.3" networks: cluster_subnet: name: cluster_subnet diff --git a/shotover-proxy/tests/test-configs/cassandra/protect-aws/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/protect-aws/docker-compose.yaml index a4308021b..b970935e5 100644 --- a/shotover-proxy/tests/test-configs/cassandra/protect-aws/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/protect-aws/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: cassandra-one: image: shotover/cassandra-test:4.0.6-r1 diff --git a/shotover-proxy/tests/test-configs/cassandra/protect-local/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/protect-local/docker-compose.yaml index a4308021b..b970935e5 100644 --- a/shotover-proxy/tests/test-configs/cassandra/protect-local/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/protect-local/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: cassandra-one: image: shotover/cassandra-test:4.0.6-r1 diff --git a/shotover-proxy/tests/test-configs/cassandra/redis-cache/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/redis-cache/docker-compose.yaml index 64289fcb1..fc0ee6f37 100644 --- a/shotover-proxy/tests/test-configs/cassandra/redis-cache/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/redis-cache/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: redis-one: image: library/redis:5.0.9 diff --git a/shotover-proxy/tests/test-configs/cassandra/request-throttling/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/request-throttling/docker-compose.yaml index a4308021b..b970935e5 100644 --- a/shotover-proxy/tests/test-configs/cassandra/request-throttling/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/request-throttling/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: cassandra-one: image: shotover/cassandra-test:4.0.6-r1 diff --git a/shotover-proxy/tests/test-configs/cassandra/tls/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/tls/docker-compose.yaml index 22a18a91f..a1ca515b8 100644 --- a/shotover-proxy/tests/test-configs/cassandra/tls/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/cassandra/tls/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: cassandra-one: image: shotover/cassandra-test:4.0.6-r1 diff --git a/shotover-proxy/tests/test-configs/kafka/bench/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/bench/docker-compose.yaml index ced9c05ab..578047056 100644 --- a/shotover-proxy/tests/test-configs/kafka/bench/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/kafka/bench/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3" services: kafka0: image: 'bitnami/kafka:3.6.1-debian-11-r24' diff --git a/shotover-proxy/tests/test-configs/kafka/cluster-1-rack/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/cluster-1-rack/docker-compose.yaml index f0bf6f799..5dfc8c51a 100644 --- a/shotover-proxy/tests/test-configs/kafka/cluster-1-rack/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/kafka/cluster-1-rack/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3" networks: cluster_subnet: name: cluster_subnet diff --git a/shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose.yaml index c82bd9101..5842425d6 100644 --- a/shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3" networks: cluster_subnet: name: cluster_subnet diff --git a/shotover-proxy/tests/test-configs/kafka/cluster-sasl/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/cluster-sasl/docker-compose.yaml index 6abfe70a5..d934dc003 100644 --- a/shotover-proxy/tests/test-configs/kafka/cluster-sasl/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/kafka/cluster-sasl/docker-compose.yaml @@ -1,5 +1,3 @@ -version: '3' - networks: cluster_subnet: name: cluster_subnet diff --git a/shotover-proxy/tests/test-configs/kafka/cluster-tls/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/cluster-tls/docker-compose.yaml index 7e019385c..6d7521c51 100644 --- a/shotover-proxy/tests/test-configs/kafka/cluster-tls/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/kafka/cluster-tls/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3" networks: cluster_subnet: name: cluster_subnet diff --git a/shotover-proxy/tests/test-configs/kafka/passthrough-sasl/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/passthrough-sasl/docker-compose.yaml index 63c802715..f29c86575 100644 --- a/shotover-proxy/tests/test-configs/kafka/passthrough-sasl/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/kafka/passthrough-sasl/docker-compose.yaml @@ -1,5 +1,3 @@ -version: '2' - services: kafka: image: 'bitnami/kafka:3.6.1-debian-11-r24' @@ -23,4 +21,3 @@ services: - KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL=PLAIN - KAFKA_INTER_BROKER_USER=controller_user - KAFKA_INTER_BROKER_PASSWORD=controller_password - diff --git a/shotover-proxy/tests/test-configs/kafka/passthrough-tls/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/passthrough-tls/docker-compose.yaml index cfb2f4f93..65bdf9654 100644 --- a/shotover-proxy/tests/test-configs/kafka/passthrough-tls/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/kafka/passthrough-tls/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3" services: kafka0: image: 'bitnami/kafka:3.6.1-debian-11-r24' diff --git a/shotover-proxy/tests/test-configs/kafka/passthrough/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/passthrough/docker-compose.yaml index 62707d6c9..6a3b3ee23 100644 --- a/shotover-proxy/tests/test-configs/kafka/passthrough/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/kafka/passthrough/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3" services: kafka0: image: 'bitnami/kafka:3.6.1-debian-11-r24' diff --git a/shotover-proxy/tests/test-configs/log-to-file/docker-compose.yaml b/shotover-proxy/tests/test-configs/log-to-file/docker-compose.yaml index b8361b077..7acef8da1 100644 --- a/shotover-proxy/tests/test-configs/log-to-file/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/log-to-file/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: redis-one: image: library/redis:5.0.9 diff --git a/shotover-proxy/tests/test-configs/opensearch-passthrough/docker-compose.yaml b/shotover-proxy/tests/test-configs/opensearch-passthrough/docker-compose.yaml index f6261a928..f0a37dfe5 100644 --- a/shotover-proxy/tests/test-configs/opensearch-passthrough/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/opensearch-passthrough/docker-compose.yaml @@ -1,4 +1,3 @@ -version: '3' services: opensearch-node1: image: opensearchproject/opensearch:2.9.0 @@ -23,4 +22,3 @@ services: ports: - 9200:9200 - 9600:9600 - diff --git a/shotover-proxy/tests/test-configs/redis/cluster-auth/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/cluster-auth/docker-compose.yaml index 51cc10fc1..6dd955774 100644 --- a/shotover-proxy/tests/test-configs/redis/cluster-auth/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/cluster-auth/docker-compose.yaml @@ -1,11 +1,9 @@ -version: '3.3' services: redis-node-0: image: &image bitnami/redis-cluster:6.2.12-debian-11-r26 ports: - "2230:6379" - environment: - &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' diff --git a/shotover-proxy/tests/test-configs/redis/cluster-dr/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/cluster-dr/docker-compose.yaml index aaad99ca5..6965fca35 100644 --- a/shotover-proxy/tests/test-configs/redis/cluster-dr/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/cluster-dr/docker-compose.yaml @@ -1,11 +1,9 @@ -version: '3.3' services: redis-node-0: image: &image bitnami/redis-cluster:6.2.12-debian-11-r26 ports: - "2220:6379" - environment: - &node-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' @@ -59,8 +57,7 @@ services: image: *image ports: - "2120:6379" - environment: - &dr-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' diff --git a/shotover-proxy/tests/test-configs/redis/cluster-handling/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/cluster-handling/docker-compose.yaml index 38b1df757..373102694 100644 --- a/shotover-proxy/tests/test-configs/redis/cluster-handling/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/cluster-handling/docker-compose.yaml @@ -1,4 +1,3 @@ -version: '3.3' networks: cluster_subnet: name: cluster_subnet @@ -14,8 +13,7 @@ services: cluster_subnet: ipv4_address: 172.16.1.2 image: &image bitnami/redis-cluster:6.2.12-debian-11-r26 - environment: - &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' diff --git a/shotover-proxy/tests/test-configs/redis/cluster-hiding/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/cluster-hiding/docker-compose.yaml index 38b1df757..373102694 100644 --- a/shotover-proxy/tests/test-configs/redis/cluster-hiding/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/cluster-hiding/docker-compose.yaml @@ -1,4 +1,3 @@ -version: '3.3' networks: cluster_subnet: name: cluster_subnet @@ -14,8 +13,7 @@ services: cluster_subnet: ipv4_address: 172.16.1.2 image: &image bitnami/redis-cluster:6.2.12-debian-11-r26 - environment: - &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' diff --git a/shotover-proxy/tests/test-configs/redis/cluster-ports-rewrite/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/cluster-ports-rewrite/docker-compose.yaml index cefdffaff..5f1d9dbd4 100644 --- a/shotover-proxy/tests/test-configs/redis/cluster-ports-rewrite/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/cluster-ports-rewrite/docker-compose.yaml @@ -1,11 +1,9 @@ -version: '3.3' services: redis-node-0: image: &image bitnami/redis-cluster:6.2.12-debian-11-r26 ports: - "2220:6379" - environment: - &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' diff --git a/shotover-proxy/tests/test-configs/redis/cluster-tls/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/cluster-tls/docker-compose.yaml index b6cd5bd48..34de9e2a7 100644 --- a/shotover-proxy/tests/test-configs/redis/cluster-tls/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/cluster-tls/docker-compose.yaml @@ -1,4 +1,3 @@ -version: '3.3' networks: cluster_subnet: name: cluster_subnet @@ -18,8 +17,7 @@ services: volumes: - &keys ../tls/certs:/usr/local/etc/redis/certs - environment: - &node_environment + environment: &node_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_TLS_PORT=6379' diff --git a/shotover-proxy/tests/test-configs/redis/multi/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/multi/docker-compose.yaml index 314017417..3baadb545 100644 --- a/shotover-proxy/tests/test-configs/redis/multi/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/multi/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: redis-one: image: &image library/redis:5.0.9 diff --git a/shotover-proxy/tests/test-configs/redis/passthrough/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/passthrough/docker-compose.yaml index b3fe44edb..24483c51f 100644 --- a/shotover-proxy/tests/test-configs/redis/passthrough/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/passthrough/docker-compose.yaml @@ -1,9 +1,8 @@ -version: "3.3" services: redis-one: image: library/redis:5.0.9 ports: - "1111:6379" volumes: - - ./redis.conf:/usr/local/etc/redis/redis.conf - command: ["redis-server", "/usr/local/etc/redis/redis.conf"] + - ./redis.conf:/usr/local/etc/redis/redis.conf + command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ] diff --git a/shotover-proxy/tests/test-configs/redis/tls-no-client-auth/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/tls-no-client-auth/docker-compose.yaml index db4d09fbd..c2c767506 100644 --- a/shotover-proxy/tests/test-configs/redis/tls-no-client-auth/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/tls-no-client-auth/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: redis-one: image: bitnami/redis:6.2.13-debian-11-r73 diff --git a/shotover-proxy/tests/test-configs/redis/tls-no-verify-hostname/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/tls-no-verify-hostname/docker-compose.yaml index 281bb7418..9c46c43f3 100644 --- a/shotover-proxy/tests/test-configs/redis/tls-no-verify-hostname/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/tls-no-verify-hostname/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: redis-one: image: bitnami/redis:6.2.13-debian-11-r73 diff --git a/shotover-proxy/tests/test-configs/redis/tls/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/tls/docker-compose.yaml index f5b7b5df9..5fd3735d1 100644 --- a/shotover-proxy/tests/test-configs/redis/tls/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/tls/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: redis-one: image: bitnami/redis:6.2.13-debian-11-r73 diff --git a/shotover-proxy/tests/transforms/docker-compose-moto.yaml b/shotover-proxy/tests/transforms/docker-compose-moto.yaml index 7fbc10da6..092e15416 100644 --- a/shotover-proxy/tests/transforms/docker-compose-moto.yaml +++ b/shotover-proxy/tests/transforms/docker-compose-moto.yaml @@ -1,4 +1,3 @@ -version: "3.3" services: moto: image: "motoserver/moto"