add annotations input #992

crazy-max · 2023-10-24T05:27:17Z

follow-up docker/buildx#2020
fixes #958

favonia · 2023-10-25T14:05:09Z

Close #958. (Will my keyword works?)

EDIT: it doesn't seem to work... but anyway that might be the issue that should be closed along with this PR.

favonia · 2023-10-25T20:24:14Z

src/context.ts

+ await Util.asyncForEach(inputs.annotations, async annotation => {
+ args.push('--annotation', annotation);
+ });
+ }


I'm glad that there's a version checking. Could we give an error in an else branch, saying it's not supported?

Signed-off-by: CrazyMax <[email protected]>

tonistiigi · 2023-11-13T20:52:06Z

README.md

@@ -217,6 +217,7 @@ Following inputs can be used as `step.with` keys
 |--------------------|-------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `add-hosts` | List/CSV | List of [customs host-to-IP mapping](https://docs.docker.com/engine/reference/commandline/build/#add-entries-to-container-hosts-file---add-host) (e.g., `docker:10.180.0.1`) |
 | `allow` | List/CSV | List of [extra privileged entitlement](https://docs.docker.com/engine/reference/commandline/buildx_build/#allow) (e.g., `network.host,security.insecure`) |
+| `annotations` | List | List of annotation to set to the image |


Could we get some more examples of what is the expected format?

@dvdksn Like other examples we have in https://docs.docker.com/build/ci/github-actions/ it might good to have one for annotations as suggested by @tonistiigi. Same in https://github.com/docker/buildx/blob/master/docs/reference/buildx_build.md for --annotation flag. Let me know if you need help about the syntax.

👍🏻 sgtm, we only have it mentioned in the exporter docs currently I think

https://docs.docker.com/build/exporters/image-registry/#annotations
https://docs.docker.com/build/exporters/oci-docker/#annotations

favonia · 2023-11-15T23:41:09Z

@crazy-max @tonistiigi Hi, as an outsider I feel the PR might not be ready for merging. It seems to have two outstanding issues: (1) the CI was testing "v0.12.0-rc1" not the latest version, which doesn't seem to be normal, and (2) it will silently ignore annotations when buildx is too old. Of course, we can fix these in another PR, but I found the merge a bit strange given these issues. I'll be happy to learn that I'm wrong. Anyway, thank you for moving forward on this issue quickly. 😀

crazy-max · 2023-11-16T09:51:45Z

(1) the CI was testing "v0.12.0-rc1" not the latest version,

Yes we are going to open a follow-up here to update to latest when Buildx 0.12.0 is GA this week. We have done this quite often when adding new inputs like build-contexts for 0.8.0.

[![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [docker/build-push-action](https://togithub.com/docker/build-push-action) | action | minor | `v5.0.0` -> `v5.1.0` | --- ### Release Notes <details> <summary>docker/build-push-action (docker/build-push-action)</summary> ### [`v5.1.0`](https://togithub.com/docker/build-push-action/releases/tag/v5.1.0) [Compare Source](https://togithub.com/docker/build-push-action/compare/v5.0.0...v5.1.0) - Add `annotations` input by [@crazy-max](https://togithub.com/crazy-max) in [docker/build-push-action#992 - Add `secret-envs` input by [@elias-lundgren](https://togithub.com/elias-lundgren) in [docker/build-push-action#980 - Bump [@babel/traverse](https://togithub.com/babel/traverse) from 7.17.3 to 7.23.2 by [@dependabot](https://togithub.com/dependabot) in [docker/build-push-action#991 - Bump [@docker/actions-toolkit](https://togithub.com/docker/actions-toolkit) from 0.13.0-rc.1 to 0.14.0 in [docker/build-push-action#990 [docker/build-push-action#1006 **Full Changelog**: docker/build-push-action@v5.0.0...v5.1.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/matter-labs/zksync-withdrawal-finalizer).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

[![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [docker/build-push-action](https://togithub.com/docker/build-push-action) | action | minor | `v5.0.0` -> `v5.1.0` | --- ### Release Notes <details> <summary>docker/build-push-action (docker/build-push-action)</summary> ### [`v5.1.0`](https://togithub.com/docker/build-push-action/releases/tag/v5.1.0) [Compare Source](https://togithub.com/docker/build-push-action/compare/v5.0.0...v5.1.0) - Add `annotations` input by [@crazy-max](https://togithub.com/crazy-max) in [docker/build-push-action#992 - Add `secret-envs` input by [@elias-lundgren](https://togithub.com/elias-lundgren) in [docker/build-push-action#980 - Bump [@babel/traverse](https://togithub.com/babel/traverse) from 7.17.3 to 7.23.2 by [@dependabot](https://togithub.com/dependabot) in [docker/build-push-action#991 - Bump [@docker/actions-toolkit](https://togithub.com/docker/actions-toolkit) from 0.13.0-rc.1 to 0.14.0 in [docker/build-push-action#990 [docker/build-push-action#1006 **Full Changelog**: docker/build-push-action@v5.0.0...v5.1.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/Mogyuchi/gh-test).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [docker/build-push-action](https://togithub.com/docker/build-push-action) | action | minor | `v5.0.0` -> `v5.1.0` | --- ### Release Notes <details> <summary>docker/build-push-action (docker/build-push-action)</summary> ### [`v5.1.0`](https://togithub.com/docker/build-push-action/releases/tag/v5.1.0) [Compare Source](https://togithub.com/docker/build-push-action/compare/v5.0.0...v5.1.0) - Add `annotations` input by [@crazy-max](https://togithub.com/crazy-max) in [docker/build-push-action#992 - Add `secret-envs` input by [@elias-lundgren](https://togithub.com/elias-lundgren) in [docker/build-push-action#980 - Bump [@babel/traverse](https://togithub.com/babel/traverse) from 7.17.3 to 7.23.2 in [docker/build-push-action#991 - Bump [@docker/actions-toolkit](https://togithub.com/docker/actions-toolkit) from 0.13.0-rc.1 to 0.14.0 in [docker/build-push-action#990 [docker/build-push-action#1006 **Full Changelog**: docker/build-push-action@v5.0.0...v5.1.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/Rapporteket/docker).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [actions/checkout](https://togithub.com/actions/checkout) | action | minor | `v4.0.0` -> `v4.1.1` | | [docker/build-push-action](https://togithub.com/docker/build-push-action) | action | minor | `v5.0.0` -> `v5.1.0` | --- ### Release Notes <details> <summary>actions/checkout (actions/checkout)</summary> ### [`v4.1.1`](https://togithub.com/actions/checkout/releases/tag/v4.1.1) [Compare Source](https://togithub.com/actions/checkout/compare/v4.1.0...v4.1.1) ##### What's Changed - Update CODEOWNERS to Launch team by [@joshmgross](https://togithub.com/joshmgross) in [actions/checkout#1510 - Correct link to GitHub Docs by [@peterbe](https://togithub.com/peterbe) in [actions/checkout#1511 - Link to release page from what's new section by [@cory-miller](https://togithub.com/cory-miller) in [actions/checkout#1514 ##### New Contributors - [@joshmgross](https://togithub.com/joshmgross) made their first contribution in [actions/checkout#1510 - [@peterbe](https://togithub.com/peterbe) made their first contribution in [actions/checkout#1511 **Full Changelog**: actions/checkout@v4.1.0...v4.1.1 ### [`v4.1.0`](https://togithub.com/actions/checkout/blob/HEAD/CHANGELOG.md#v410) [Compare Source](https://togithub.com/actions/checkout/compare/v4.0.0...v4.1.0) - [Add support for partial checkout filters](https://togithub.com/actions/checkout/pull/1396) </details> <details> <summary>docker/build-push-action (docker/build-push-action)</summary> ### [`v5.1.0`](https://togithub.com/docker/build-push-action/releases/tag/v5.1.0) [Compare Source](https://togithub.com/docker/build-push-action/compare/v5.0.0...v5.1.0) - Add `annotations` input by [@crazy-max](https://togithub.com/crazy-max) in [docker/build-push-action#992 - Add `secret-envs` input by [@elias-lundgren](https://togithub.com/elias-lundgren) in [docker/build-push-action#980 - Bump [@babel/traverse](https://togithub.com/babel/traverse) from 7.17.3 to 7.23.2 in [docker/build-push-action#991 - Bump [@docker/actions-toolkit](https://togithub.com/docker/actions-toolkit) from 0.13.0-rc.1 to 0.14.0 in [docker/build-push-action#990 [docker/build-push-action#1006 **Full Changelog**: docker/build-push-action@v5.0.0...v5.1.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/naa0yama/OpenWrt-FortiGate-50E-custom-image).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

crazy-max force-pushed the annotations branch from f0280bd to a0bf22b Compare October 24, 2023 09:33

crazy-max requested review from tonistiigi and jsternberg October 24, 2023 09:39

crazy-max marked this pull request as ready for review October 24, 2023 09:39

crazy-max mentioned this pull request Oct 25, 2023

Feature request and discussion: support of annotations docker/metadata-action#332

Closed

crazy-max mentioned this pull request Oct 25, 2023

labelPrefix flavor for annotations support docker/metadata-action#351

Closed

crazy-max force-pushed the annotations branch from a0bf22b to 662cd77 Compare October 25, 2023 15:11

favonia reviewed Oct 25, 2023

View reviewed changes

crazy-max mentioned this pull request Oct 26, 2023

build: make annotations work with push flag docker/buildx#2098

Merged

crazy-max added 3 commits October 27, 2023 06:42

ci: bump buildx to v0.12.0-rc1

b425c4c

Signed-off-by: CrazyMax <[email protected]>

add annotations input

248131c

Signed-off-by: CrazyMax <[email protected]>

chore: update generated content

c66ae3a

Signed-off-by: CrazyMax <[email protected]>

crazy-max force-pushed the annotations branch from 7e8a65e to c66ae3a Compare October 27, 2023 04:43

This was referenced Nov 10, 2023

chore: add annotations to manifest philips-software/amp-devcontainer#201

Merged

Simplify adding annotations to the manifest philips-software/amp-devcontainer#202

Closed

tonistiigi reviewed Nov 13, 2023

View reviewed changes

crazy-max added the needs/docs-follow-up label Nov 14, 2023

tonistiigi approved these changes Nov 15, 2023

View reviewed changes

tonistiigi merged commit 7a786bb into docker:master Nov 15, 2023
52 checks passed

crazy-max deleted the annotations branch November 16, 2023 09:51

dvdksn mentioned this pull request Nov 17, 2023

Annotations documentation docker/docs#18709

Closed

jcgillespie mentioned this pull request Jun 17, 2024

Bump docker/build-push-action from 5 to 6 jcgillespie/mssql-sqlpackage-docker#41

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add annotations input #992

add annotations input #992

crazy-max commented Oct 24, 2023 •

edited

Loading

favonia commented Oct 25, 2023 •

edited

Loading

favonia Oct 25, 2023 •

edited

Loading

tonistiigi Nov 13, 2023

crazy-max Nov 14, 2023

dvdksn Nov 14, 2023 •

edited

Loading

favonia commented Nov 15, 2023 •

edited

Loading

crazy-max commented Nov 16, 2023

add annotations input #992

add annotations input #992

Conversation

crazy-max commented Oct 24, 2023 • edited Loading

favonia commented Oct 25, 2023 • edited Loading

favonia Oct 25, 2023 • edited Loading

Choose a reason for hiding this comment

tonistiigi Nov 13, 2023

Choose a reason for hiding this comment

crazy-max Nov 14, 2023

Choose a reason for hiding this comment

dvdksn Nov 14, 2023 • edited Loading

Choose a reason for hiding this comment

favonia commented Nov 15, 2023 • edited Loading

crazy-max commented Nov 16, 2023

crazy-max commented Oct 24, 2023 •

edited

Loading

favonia commented Oct 25, 2023 •

edited

Loading

favonia Oct 25, 2023 •

edited

Loading

dvdksn Nov 14, 2023 •

edited

Loading

favonia commented Nov 15, 2023 •

edited

Loading