always resolve paths relative to extending file's working dir #538
+66
−11
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
ndeloof
force-pushed
the
issue_11377
branch
8 times, most recently
from
832de94 to
024ebef
Compare
glours
reviewed
Jan 19, 2024
| // replace localResourceLoader with a new flavour, using extended file base path | ||
| extendsOpts.ResourceLoaders[len(opts.ResourceLoaders)-1] = localResourceLoader{ | ||
| WorkingDir: localdir, | ||
| } | ||
| extendsOpts.ResolvePaths = true |
There was a problem hiding this comment.
This line is the root cause of the docker/compose#11377
It was introduced to remove potential import cycles 714c186
There was a problem hiding this comment.
ResolvePaths MUST be set so that ./env in a compose file that is used by extends: file=./foo/bar/compose.yaml is resolved as ./foo/bar/env and can be used as expected by the caller
Used by extend, PathResolution resolves relative paths from working directory, which is itself relative
glours
approved these changes
Jan 22, 2024
Signed-off-by: Nicolas De Loof <[email protected]>
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.
closes docker/compose#11377
closes docker/compose#11379
note: custom resource loaders defined by docker/compose will have to implement
Dir(path string)returning (absolute) path for file within the remote download cache