From 2e9afe252ba234aeac40317e9b4708857a40c8a2 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Fri, 15 Mar 2024 11:18:38 +0100 Subject: [PATCH] Docker/setups: Fix multiple merge keys in yaml > YAML parsing was improved in [docker-compose] v2.17 - the old behavior of > allowing multiple merge keys was a quirk of the parser. Reference: https://github.com/docker/compose/issues/10394#issuecomment-1481300567 --- Docker/setups/default/docker-compose.yml | 9 +++------ Docker/setups/singlehost/docker-compose.yml | 6 ++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Docker/setups/default/docker-compose.yml b/Docker/setups/default/docker-compose.yml index 3d7f282..4ce2cc3 100644 --- a/Docker/setups/default/docker-compose.yml +++ b/Docker/setups/default/docker-compose.yml @@ -23,16 +23,13 @@ x-zeek-controller: &ZEEK_CONTROLLER services: controller: - <<: *ZEEK_BASE - <<: *ZEEK_CONTROLLER + <<: [*ZEEK_BASE, *ZEEK_CONTROLLER] inst1: - <<: *ZEEK_BASE - <<: *ZEEK_AGENT + <<: [*ZEEK_BASE, *ZEEK_AGENT] inst2: - <<: *ZEEK_BASE - <<: *ZEEK_AGENT + <<: [*ZEEK_BASE, *ZEEK_AGENT] client: image: zeektest:latest diff --git a/Docker/setups/singlehost/docker-compose.yml b/Docker/setups/singlehost/docker-compose.yml index 7e0cdc2..3ee9a2b 100644 --- a/Docker/setups/singlehost/docker-compose.yml +++ b/Docker/setups/singlehost/docker-compose.yml @@ -29,9 +29,7 @@ x-zeek-client: &ZEEK_CLIENT services: controller: - <<: *ZEEK_BASE - <<: *ZEEK_CONTROLLER + <<: [*ZEEK_BASE, *ZEEK_CONTROLLER] client: - <<: *ZEEK_BASE - <<: *ZEEK_CLIENT + <<: [*ZEEK_BASE, *ZEEK_CLIENT]