From cd51281355fecde07bdb435616e09945ccec5e76 Mon Sep 17 00:00:00 2001 From: Andrew Bates Date: Thu, 11 May 2023 09:52:09 -0400 Subject: [PATCH] fix: docker-compose fails with multiple merge keys Docker compose no longer allows multiple merge keys in compose files. The YAML spec allows multiple maps to be merged by passing a sequence to the merge (`<<:`) key. This is documented in the [YAML spec](https://yaml.org/type/merge.html). The behavior change for docker-compose is documented in [this issue](https://github.com/docker/compose/issues/10411) --- development/docker-compose.base.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/development/docker-compose.base.yml b/development/docker-compose.base.yml index 32bf255c..c875afa4 100644 --- a/development/docker-compose.base.yml +++ b/development/docker-compose.base.yml @@ -26,8 +26,9 @@ services: timeout: "10s" start_period: "120s" retries: 3 - <<: *nautobot-build - <<: *nautobot-base + <<: + - *nautobot-build + - *nautobot-base worker: entrypoint: - "sh"