Fix env file resolution #1099
Merged
Fix env file resolution #1099
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
3 tasks
| if k in override: | ||
| d[k] = override[k] | ||
|
|
||
| return d |
There was a problem hiding this comment.
It looks like this (merge_service_dicts) isn't used yet. I guess this was pulled in from the other branch?
|
I like it What about host volume binds with relative paths? Do you plan on addressing those in a separate branch? It seems like volume paths should probably also be relative to the |
|
Yes, good point. I'll update it so volume paths are treated similarly. (That's going to be fun, because we expand |
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
aanand
force-pushed
the
fix-env-file-resolution
branch
from
8f26b7b
to
528bed9
Compare
|
After some thought, I'm going to do volume paths separately. This is rebased and ready to go. |
|
LGTM |
yuval-k
pushed a commit
to yuval-k/compose
that referenced
this pull request
Apr 10, 2015
Fix env file resolution Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
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.
Environment variable file paths should be considered relative to the compose file, not to the current directory. These are usually the same, unless the user specifies an alternate one in a different directory with
-f.