From 692151d26ccf78f7abffd8e54dfd26bf4196d5dc Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Fri, 7 Apr 2023 00:58:36 +0100
Subject: [PATCH] fix: Docker Compose YAML error

Implement the fix from
https://github.com/docker/compose/issues/10411#issuecomment-1488019350.

Refs: OD-12
---
 templates/docker-compose.yaml.twig | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/templates/docker-compose.yaml.twig b/templates/docker-compose.yaml.twig
index 4437c1d..eb20f09 100644
--- a/templates/docker-compose.yaml.twig
+++ b/templates/docker-compose.yaml.twig
@@ -33,8 +33,7 @@ x-app: &default-app
 services:
   {% if dockerCompose.services.web is not defined or dockerCompose.services.web != false -%}
   web:
-    <<: *default-app
-    <<: *default-proxy
+    <<: [*default-proxy, *default-app]
     build:
       context: .
       target: web
@@ -60,8 +59,7 @@ services:
     profiles: [php]
 {% elseif "node" == language %}
   node:
-    <<: *default-app
-    {{ type is same as "fractal" ? "<<: *default-proxy" }}
+    {{ type is same as "fractal" ? "<<: [*default-proxy, *default-app]" : "<<: *default-app" }}
     build:
       context: .
       target: build