Override docker-compose.yaml on ddev start, fixes #762 #819
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rfay
changed the title
rickmanelius
suggested changes
May 3, 2018
There was a problem hiding this comment.
Preparation
git checkout 124ad099andmake darwinddev version=> v0.17.0-9-g124ad099- Fresh drupal-7.59 site
Testing
- Fresh site, run
ddev config - Reviewed .ddev/config.yml to see if there were any notable differences (none jumped out at me).
- Ran
ddev start - Reviewed .ddev/docker-compose.yml and observed #ddev-generated on line 2
- Removed the comment, re-ran
ddev start- Observed "User-managed docker-compose.yaml will be replaced with ddev-generated docker-compose.yaml. Original file will be placed in docker-compose.yaml.bak"
- Idea: I almost feel like with this change we need to lead people to a page in our documentation that describes why we do this and how to best structure your overrides or individual services.
- Removed the comment, re-ran
ddev starta second time.- I noted we only keep one backup. This is probably fine because I don't want to keep .bak.10.REALIMPORTANT things laying around.
- Running again with not changes. Everything went smoothly.
I do think with such a significant change that we probably need to have documentation updates to reflect this along with the fact that we now version config.yml and we don't explicitly call out the default containers in config.yml. That said, I'm thumbs up on the functionality.
rfay
force-pushed
the
20180501_override_docker_compose
branch
from
124ad09
to
7349cb2
Compare
|
@rickmanelius I think you requested changes because of required docs. Please check the paragraph that I already had slipped in upstream, https://github.com/drud/ddev/blob/master/docs/users/extend/custom-compose-files.md#restrictions-on-the-docker-composeyaml-file and see if that does it for you, and approve if it does. |
rickmanelius
approved these changes
May 4, 2018
There was a problem hiding this comment.
Hi @rfay. I had missed that documentation change. Looks good. Approved!
rfay
force-pushed
the
20180501_override_docker_compose
branch
from
e8dbef0
to
696251a
Compare
rfay
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Problem/Issue/Bug:
OP #762: We keep having to tell people to delete docker-compose.yaml on ddev upgrades. We made the decision to take control of docker-compose.yaml
This PR addresses the changes for docker-compose.yaml, another PR will address the changes to config.yaml handling.
How this PR Solves The Problem:
#ddev-generatedin docker-compose. If not found, renames the file to docker-compose.yaml.bak and warns the user.Manual Testing Instructions:
ddev startwith this versionAutomated Testing Overview:
Nothing at this point.
Related Issue Link(s):
OP #762
Release/Deployment notes: