Skip to content

Commit

Permalink
Fix docker compose validation error
Browse files Browse the repository at this point in the history
Make shure we have unique yaml keys.
Inspired by this post:
docker/compose#10411 (comment)
  • Loading branch information
spaceo committed May 9, 2023
1 parent 7db7d8d commit 26d0ff0
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ services:
lagoon.type: cli-persistent
lagoon.persistent.name: nginx # mount the persistent storage of nginx into this container
lagoon.persistent: /app/web/sites/default/files/ # location where the persistent storage should be mounted
environment:
<< : *default-environment # loads the defined environment variables from the top

nginx: # Webserver in front of php-fpm. Serves static assets.
# https://docs.lagoon.sh/lagoon/docker-images/nginx/nginx-drupal
Expand All @@ -84,8 +82,8 @@ services:
CLI_IMAGE: *cli-image # Inject the name of the cli image
depends_on:
- php
<< : *default-volumes # loads the defined volumes from the top
<< : *default-user # uses the defined user from top
# loads the defined volumes and user from the top
<<: [*default-volumes, *default-user]
environment:
<< : *default-environment # loads the defined environment variables from the top
# Route that should be used locally.
Expand All @@ -106,8 +104,8 @@ services:
condition: service_started
mariadb:
condition: service_healthy
<< : *default-user # uses the defined user from top
<< : *default-volumes # loads the defined volumes from the top
# loads the defined volumes and user from the top
<<: [*default-volumes, *default-user]
environment:
<< : *default-environment # loads the defined environment variables from the top
# Uncomment to enable xdebug for web requests and then restart via `docker-compose up -d`
Expand Down

0 comments on commit 26d0ff0

Please sign in to comment.