Fix env_file overrides with extends #2450
Merged
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
dnephin
force-pushed
the
fix_env_file_ordering
branch
from
86af330 to
f755c32
Compare
|
Should this be rebased now that #2405 is in? |
|
I can rebase it to update github, but it won't change the actual merge |
dnephin
force-pushed
the
fix_env_file_ordering
branch
2 times, most recently
from
25acac4 to
7768945
Compare
|
Ok, rebased |
Split env resolving into two phases. The first phase is to expand the paths of env_files, which is done before merging extends. Once all files are merged together, the final phase is to read the env_files and use them as the base for environment variables. Signed-off-by: Daniel Nephin <dnephin@docker.com>
dnephin
force-pushed
the
fix_env_file_ordering
branch
from
7768945 to
e67bc25
Compare
|
Great. Makes the PR easier to read at least! LGTM |
aanand
added a commit
that referenced
this pull request
Nov 25, 2015
Fix env_file overrides with extends
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.
Based on #2405
Fixes #2446