Skip to content

Reset extends#648

Merged
glours merged 2 commits intocompose-spec:mainfrom
ndeloof:reset_extends
Jul 2, 2024
Merged

Reset extends#648
glours merged 2 commits intocompose-spec:mainfrom
ndeloof:reset_extends

Conversation

@ndeloof
Copy link
Copy Markdown
Collaborator

@ndeloof ndeloof commented Jun 27, 2024

This introduces loadYamlFile to load a single compose file, running most of the processing.
!reset tags collected by a post-processor is returned to caller. It is used when running the recursive extends processing outside the main loading-and-merge pipeline

fixes docker/compose#11937

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
@ndeloof ndeloof requested review from glours and jhrotko June 27, 2024 09:13
return err
}

return err
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

return nil

@jhrotko
Copy link
Copy Markdown
Collaborator

jhrotko commented Jun 27, 2024

that's a big change! (nice) did you try running compose e2e tests against this branch?

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
@ndeloof
Copy link
Copy Markdown
Collaborator Author

ndeloof commented Jul 1, 2024

that's a big change!

actually, I "just" extracted a long block into a new function. Github code review doesn't make this easy to notice

tested on docker/compose#11950

Copy link
Copy Markdown
Collaborator

@jhrotko jhrotko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Copy Markdown
Collaborator

@glours glours left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@glours glours merged commit 8f1be26 into compose-spec:main Jul 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] !reset is not correctly handled when used with extends and templates

3 participants