process extends recursively
#547
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
ndeloof
force-pushed
the
extends_race
branch
2 times, most recently
from
a824217 to
b93a956
Compare
milas
approved these changes
Jan 24, 2024
loader/extends.go
Outdated
Comment on lines
124
to
128
| extendsOpts.ResourceLoaders = append([]ResourceLoader{}, opts.ResourceLoaders...) | ||
| // replace localResourceLoader with a new flavour, using extended file base path | ||
| extendsOpts.ResourceLoaders[len(opts.ResourceLoaders)-1] = localResourceLoader{ | ||
| WorkingDir: localdir, | ||
| } |
There was a problem hiding this comment.
Instead of assuming that localResourceLoader is the last in the slice, it might be better to loop through and attempt to cast them until you find it and then replace it
There was a problem hiding this comment.
this isn't an assumption, local resource loader has to be the last in the slice as all "remote" resource loaders are checked first.
There was a problem hiding this comment.
I introduced RemoteResourceLoaders to check this implicit rule
ndeloof
force-pushed
the
extends_race
branch
2 times, most recently
from
99d2fbd to
8ef0fb3
Compare
Signed-off-by: Nicolas De Loof <[email protected]>
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.
fixes docker/compose#11394
issue takes place when there's a chain of extending services:
The root cause for this issue is that we try to extends a service before the compose model has been fully resolved. Typically loading this illustration example, if first service (which go map iteration makes random) to be processed is
service, it will merge with siblinglevel2. This results in abuildmapping defined without acontext, and will default to.. But iflevel2is loaded first, it will havebuild.contextset to.., and thenservicewill do as well.This PR changes the logic so that we force
extendsto be applied recursively on services using new funcapplyServiceExtends. This one will process a service to applyextendsif needed (otherwise is no-op). Once it has identified the base service used by extends, it executes recursively to enforce this one to be fully defined