Updated formatting for the docker compose file to fix a error. (#3421)

This fixes the error message "There is an error in the yaml syntax: YAMLSemanticError: Map keys must be unique; "<<" is repeated" which is received if trying to deploy the docker compose using portainer it will not even allow you to click the button because of the formatting error. This is a page showing a example of what I did "http://yaml.org/type/merge.html" Instead of 2 merge requests docker/portainer only allows 1 merge request in this situation so they had to be combined into 1 line instead of 2.
This commit is contained in:
Matthew Hugley 2021-07-04 17:21:49 -05:00 committed by Dane Everitt
parent 9c64fb29a4
commit cfb5b8c244
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53

View File

@ -61,8 +61,7 @@ services:
- "/srv/pterodactyl/certs/:/etc/letsencrypt/" - "/srv/pterodactyl/certs/:/etc/letsencrypt/"
- "/srv/pterodactyl/logs/:/app/storage/logs" - "/srv/pterodactyl/logs/:/app/storage/logs"
environment: environment:
<<: *panel-environment <<: [*panel-environment, *mail-environment]
<<: *mail-environment
DB_PASSWORD: *db-password DB_PASSWORD: *db-password
APP_ENV: "production" APP_ENV: "production"
APP_ENVIRONMENT_ONLY: "false" APP_ENVIRONMENT_ONLY: "false"