Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow docker-compose.*.yml as well as docker-compose.*.yaml, fixes #2217 #2220

Merged
merged 2 commits into from
May 11, 2020

Conversation

rfay
Copy link
Member

@rfay rfay commented Apr 25, 2020

The Problem/Issue/Bug:

#2217 pointed out that v1.14.0 (deliberately) disallowed docker-compose add-ons of the format docker-compose.*.yml. This seems unnecessary.

How this PR Solves The Problem:

Put it back to allow docker-compose.*.yml

Manual Testing Instructions:

  • Test add-on 3rd party services with docker-compose.*.yml as well as docker-compose.*.yaml
  • Verify that a mixture of yaml and yml files works out OK.
  • Verify that no additional files are picked up with this glob pattern
  • Review the code to make sure it does what's expected
  • What happens when there is a docker-compose.override.yaml and also a docker-compose.override.yml ?

Automated Testing Overview:

Related Issue Link(s):

Release/Deployment notes:

@rfay rfay force-pushed the 20200425_allow_docker_compose_yml branch 2 times, most recently from 9d7c074 to df786ce Compare May 5, 2020 15:06
@rfay rfay changed the title Allow docker-compose.*.y*ml, fixes #2217 Allow docker-compose.*.yml as well as docker-compose.*.yaml, fixes #2217 May 11, 2020
@rfay rfay force-pushed the 20200425_allow_docker_compose_yml branch from d05662d to 8f72b55 Compare May 11, 2020 17:16
@rfay rfay merged commit bb80820 into ddev:master May 11, 2020
@rfay rfay deleted the 20200425_allow_docker_compose_yml branch May 11, 2020 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant