Skip to content

Commit

Permalink
fix: docker-compose fails with multiple merge keys
Browse files Browse the repository at this point in the history
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](docker/compose#10411)
  • Loading branch information
abates committed May 11, 2023
1 parent d746fb6 commit cd51281
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions development/docker-compose.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ services:
timeout: "10s"
start_period: "120s"
retries: 3
<<: *nautobot-build
<<: *nautobot-base
<<:
- *nautobot-build
- *nautobot-base
worker:
entrypoint:
- "sh"
Expand Down

0 comments on commit cd51281

Please sign in to comment.