Skip to content

stage_executor,getCreatedBy: expand buildArgs before invoking generatePathChecksum #6110

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

Merged
merged 1 commit into from
Apr 10, 2025

Conversation

flouthoc
Copy link
Collaborator

@flouthoc flouthoc commented Apr 4, 2025

Patch in PR #5691 added a function to calculate and write checksum to history of source in --mount instructions but it did not add part to expand build args if they are present in source path.

Following PR Just corrects the above issue and also adds a new test to make sure we don't break this in future again.

Closes: containers/podman#25425

What type of PR is this?

/kind api-change
/kind bug
/kind cleanup
/kind deprecation
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake
/kind other

What this PR does / why we need it:

How to verify it

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

Copy link
Member

@nalind nalind 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
Contributor

openshift-ci bot commented Apr 7, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, nalind

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved label Apr 7, 2025
@flouthoc
Copy link
Collaborator Author

flouthoc commented Apr 8, 2025

@rhatdan @TomSweeneyRedHat @Honny1 PTAL

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

I don't understand enough about the buildah codebase but does that mean you are calling ProcessWord() twice on the that input. Supposedly it worked before the cache logic and now you add one new call for the cache. To me that seems to suggest we do that in two places which then means we might get a certain drift in behaviours?

Anyhow I don't understand enough about buildah so I am happy to shut up and say LGTM as it seems to fix the bug.

@TomSweeneyRedHat
Copy link
Member

@flouthoc looks like this branch needs an update.

@TomSweeneyRedHat
Copy link
Member

One question, an updte needed, otherwise LGTM

Patch in PR containers#5691 added a
function to calculate and write checksum to history of `source` in
`--mount` instructions but it did not add part to expand build args if
they are present in `source` path.

Following PR Just corrects the above issue and also adds a new test to
make sure we don't break this in future again.

Closes: containers/podman#25425

Signed-off-by: flouthoc <[email protected]>
@TomSweeneyRedHat
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Apr 10, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 025e3e5 into containers:main Apr 10, 2025
31 of 37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants