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: docker/compose#10394 (comment)
zeek · Mar 15, 2024 · 2e9afe2 · 2e9afe2
1 parent 3982e24
commit 2e9afe2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git 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
@@ -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]