Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reset extends #648

Merged
merged 2 commits into from
Jul 2, 2024
Merged

Reset extends #648

merged 2 commits into from
Jul 2, 2024

Conversation

ndeloof
Copy link
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

@ndeloof ndeloof requested review from jhrotko and glours June 27, 2024 09:13
}

return err
Copy link
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
Collaborator

jhrotko commented Jun 27, 2024

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

@ndeloof
Copy link
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
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
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
8 checks passed
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