build: make annotations work with push flag #2098
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
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
jsternberg
approved these changes
Oct 26, 2023
Comment on lines
-179
to
-184
| for _, e := range opts.Exports { | ||
| for k, v := range annotations { | ||
| e.Attrs[k.String()] = v | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
So here --push hasn't been translated to an export entry. Can you just link me the line where this happens for learning purposes?
Comment on lines
+140
to
+144
| for _, o := range outputs { | ||
| for k, v := range annotations { | ||
| o.Attrs[k.String()] = v | ||
| } | ||
| } |
There was a problem hiding this comment.
It's delayed here (so --push is a true alias for --output=type=registry) and that's why this works.
jedevc
approved these changes
Oct 26, 2023
|
Please ignore my previous (deleted) comment, which is nonsensical. |
tonistiigi
approved these changes
Oct 26, 2023
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.
related to #2020
When implementing annotations in our build-push-action (docker/build-push-action#992), I found out they were not working: https://github.com/docker/build-push-action/actions/runs/6642453793/job/18047273130#step:7:24
Annotations work with
--outputbut it doesn't when using--push. This moves the parsing annotations logic to the controller so we can set annotations after--pushhas been converted to an export entry.