imagebuildah.StageExecutor.Execute: commit more "no instructions" cases#6314
Merged
openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom Aug 7, 2025
Merged
Conversation
When there are no instructions to process, we try to reuse the base image. When we've been told, out of band, to remove labels or environment variables, or affect annotations, we still need to, though, so check for values of more of those flags. Signed-off-by: Nalin Dahyabhai <[email protected]>
openshift-ci
bot
added
kind/bug
| if len(children) == 0 { | ||
| // There are no steps. | ||
| if s.builder.FromImageID == "" || s.executor.squash || s.executor.confidentialWorkload.Convert || len(s.executor.labels) > 0 || len(s.executor.annotations) > 0 || len(s.executor.unsetEnvs) > 0 || len(s.executor.unsetLabels) > 0 || len(s.executor.sbomScanOptions) > 0 || len(s.executor.unsetAnnotations) > 0 { | ||
| if s.builder.FromImageID == "" || s.executor.squash || s.executor.confidentialWorkload.Convert || len(s.executor.annotations) > 0 || len(s.executor.unsetEnvs) > 0 || len(s.executor.unsetLabels) > 0 || len(s.executor.sbomScanOptions) > 0 || len(s.executor.unsetAnnotations) > 0 || s.executor.inheritLabels == types.OptionalBoolFalse || s.executor.inheritAnnotations == types.OptionalBoolFalse { |
Member
There was a problem hiding this comment.
Did you mean to remove:
len(s.executor.labels) > 0 ||
Member
Author
There was a problem hiding this comment.
Yes. With --label and --env, which have corresponding instructions, we append them to the parsed version of the Dockerfile before, making children nonzero in length, so that condition could never be true.
Member
|
LGTM |
Contributor
|
[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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
What type of PR is this?
/kind bug
What this PR does / why we need it:
When there are no instructions to process, we try to reuse the base image. When we've been told, out of band, to remove labels or environment variables, or affect annotations, we still need to, though, so check for values of more of those flags.
How to verify it
New integration test!
Which issue(s) this PR fixes:
None
Special notes for your reviewer:
Does this PR introduce a user-facing change?