2128 relative path on windows #2175
Closed
Conversation
This file contains hidden or 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
mnowster
force-pushed
the
2128-relative-path-on-windows
branch
4 times, most recently
from
ccf0cce to
b622fa7
Compare
It's a class of error that we need shared, as it'll be used by config.py Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
After a config file has been fully interpolated, we expand all of the volume paths. This helps ensure that splitdrive works correctly, as it won't be dealing with any relative paths. Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
Previously it was using self.working_dir from the service that had extends not the location of where we are extending from. Hard to write that sentence to make sense. pre_processing expands volume paths and should do so relative to the file they are defined in. Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
Doing the path expansion much earlier on means requires that we don't lose the intended behaviour of no path expansion if a volume driver is specified, as per: docker@a68ee0d9 Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
The expansion logic has already been done during pre_process_config so it's not needed here anymore. Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
Now that path expansion logic is happening in the pre_process_config to ensure the logic we're testing is happening, don't short cut to use make_service_dict and instead go through the appropriate config.load. Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
mnowster
force-pushed
the
2128-relative-path-on-windows
branch
from
b622fa7 to
a339437
Compare
mnowster
changed the title
There was a problem hiding this comment.
A TODO about this being legacy and us needing to consolidate to use the ConfigurationError would be good here I think
Author
|
Closing in favour of #2181 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Expand volume paths much earlier so that we don't give relative paths to
splitdrive.Should fix #2128