Skip to content

annotations support#352

Merged
crazy-max merged 2 commits intodocker:masterfrom
crazy-max:annotations-alt
Nov 30, 2023
Merged

annotations support#352
crazy-max merged 2 commits intodocker:masterfrom
crazy-max:annotations-alt

Conversation

@crazy-max
Copy link
Copy Markdown
Member

@crazy-max crazy-max commented Oct 27, 2023

fixes #332
fixes #355
needs #353
closes #351

alternative to #351 that sets an output and a bake definition for annotations: https://github.com/moby/buildkit/blob/master/docs/annotations.md

@crazy-max crazy-max force-pushed the annotations-alt branch 2 times, most recently from e2b8a19 to dcd3d04 Compare November 16, 2023 15:33
@crazy-max crazy-max force-pushed the annotations-alt branch 2 times, most recently from 93493bb to 7638eb6 Compare November 27, 2023 10:51
@crazy-max crazy-max marked this pull request as ready for review November 27, 2023 10:53
Comment thread action.yml Outdated
@crazy-max crazy-max force-pushed the annotations-alt branch 2 times, most recently from 83d6c9d to 71d3e79 Compare November 29, 2023 15:13
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
@crazy-max crazy-max merged commit f33ad1e into docker:master Nov 30, 2023
@crazy-max crazy-max deleted the annotations-alt branch November 30, 2023 09:11
@aerosol
Copy link
Copy Markdown

aerosol commented Nov 30, 2023

Hey guys, this is causing invalid json carried over in steps metadata, an example that just broke our build pipeline:

(...) ,"annotations":["manifest:org.opencontainers.image.created=2023-11-30T12:46:22.687Z",manifest:org.opencontainers.image.description=Simple, open source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics.,manifest:org.opencontainers.image.licenses=AGPL-3.0,manifest:org.opencontainers.image.revision=7bf1e2a6ed54b88e475898a18f9690bc5f690de4,manifest:org.opencontainers.image.source=https://github.com/plausible/analytics,manifest:org.opencontainers.image.title=analytics,manifest:org.opencontainers.image.url=https://github.com/plausible/analytics,"manifest:org.opencontainers.image.version=r2023.11.30-265"]}

Clearly there's some JSON encoding missing there. The second annotations item isn't surrounded with quotes.

aerosol added a commit to plausible/analytics that referenced this pull request Nov 30, 2023
aerosol added a commit to plausible/analytics that referenced this pull request Nov 30, 2023
renovate Bot referenced this pull request in 4m-mazi/gh-test Nov 30, 2023
[![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/metadata-action](https://togithub.com/docker/metadata-action)
| action | minor | `v5.0.0` -> `v5.1.0` |

---

### Release Notes

<details>
<summary>docker/metadata-action (docker/metadata-action)</summary>

###
[`v5.1.0`](https://togithub.com/docker/metadata-action/releases/tag/v5.1.0)

[Compare
Source](https://togithub.com/docker/metadata-action/compare/v5.0.0...v5.1.0)

#### What's Changed

- Annotations support by
[@&#8203;crazy-max](https://togithub.com/crazy-max) in
[https://github.com/docker/metadata-action/pull/352](https://togithub.com/docker/metadata-action/pull/352)
- Split bake definition into two files by
[@&#8203;crazy-max](https://togithub.com/crazy-max) in
[https://github.com/docker/metadata-action/pull/353](https://togithub.com/docker/metadata-action/pull/353)
- Allow images input to be empty to output bare tags by
[@&#8203;crazy-max](https://togithub.com/crazy-max) in
[https://github.com/docker/metadata-action/pull/358](https://togithub.com/docker/metadata-action/pull/358)
- Bump [@&#8203;actions/github](https://togithub.com/actions/github)
from 5.1.1 to 6.0.0 in
[https://github.com/docker/metadata-action/pull/348](https://togithub.com/docker/metadata-action/pull/348)
- Bump [@&#8203;babel/traverse](https://togithub.com/babel/traverse)
from 7.17.3 to 7.23.2 in
[https://github.com/docker/metadata-action/pull/350](https://togithub.com/docker/metadata-action/pull/350)
- Bump
[@&#8203;docker/actions-toolkit](https://togithub.com/docker/actions-toolkit)
from 0.12.0 to 0.14.0 in
[https://github.com/docker/metadata-action/pull/349](https://togithub.com/docker/metadata-action/pull/349)
[https://github.com/docker/metadata-action/pull/357](https://togithub.com/docker/metadata-action/pull/357)
- Bump csv-parse from 5.5.0 to 5.5.2 in
[https://github.com/docker/metadata-action/pull/346](https://togithub.com/docker/metadata-action/pull/346)
- Bump semver from 7.5.3 to 7.5.4 in
[https://github.com/docker/metadata-action/pull/335](https://togithub.com/docker/metadata-action/pull/335)

**Full Changelog**:
docker/metadata-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).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy41OS44IiwidXBkYXRlZEluVmVyIjoiMzcuNTkuOCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This was referenced Nov 30, 2023
arnfinn referenced this pull request in Rapporteket/docker Jan 5, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [docker/metadata-action](https://togithub.com/docker/metadata-action)
| action | minor | `v5.0.0` -> `v5.4.0` |

---

### Release Notes

<details>
<summary>docker/metadata-action (docker/metadata-action)</summary>

###
[`v5.4.0`](https://togithub.com/docker/metadata-action/releases/tag/v5.4.0)

[Compare
Source](https://togithub.com/docker/metadata-action/compare/v5.3.0...v5.4.0)

- Bump
[@&#8203;docker/actions-toolkit](https://togithub.com/docker/actions-toolkit)
from 0.15.0 to 0.16.0 in
[https://github.com/docker/metadata-action/pull/369](https://togithub.com/docker/metadata-action/pull/369)
- Bump csv-parse from 5.5.2 to 5.5.3 in
[https://github.com/docker/metadata-action/pull/365](https://togithub.com/docker/metadata-action/pull/365)

**Full Changelog**:
docker/metadata-action@v5.3.0...v5.4.0

###
[`v5.3.0`](https://togithub.com/docker/metadata-action/releases/tag/v5.3.0)

[Compare
Source](https://togithub.com/docker/metadata-action/compare/v5.2.0...v5.3.0)

- Bump
[@&#8203;docker/actions-toolkit](https://togithub.com/docker/actions-toolkit)
from 0.14.0 to 0.15.0 in
[https://github.com/docker/metadata-action/pull/363](https://togithub.com/docker/metadata-action/pull/363)
(fixes
[#&#8203;362](https://togithub.com/docker/metadata-action/issues/362))

**Full Changelog**:
docker/metadata-action@v5.2.0...v5.3.0

###
[`v5.2.0`](https://togithub.com/docker/metadata-action/releases/tag/v5.2.0)

[Compare
Source](https://togithub.com/docker/metadata-action/compare/v5.1.0...v5.2.0)

- Custom annotations support by
[@&#8203;crazy-max](https://togithub.com/crazy-max) in
[https://github.com/docker/metadata-action/pull/361](https://togithub.com/docker/metadata-action/pull/361)

**Full Changelog**:
docker/metadata-action@v5.1.0...v5.2.0

###
[`v5.1.0`](https://togithub.com/docker/metadata-action/releases/tag/v5.1.0)

[Compare
Source](https://togithub.com/docker/metadata-action/compare/v5.0.0...v5.1.0)

- Annotations support by
[@&#8203;crazy-max](https://togithub.com/crazy-max) in
[https://github.com/docker/metadata-action/pull/352](https://togithub.com/docker/metadata-action/pull/352)
- Split bake definition into two files by
[@&#8203;crazy-max](https://togithub.com/crazy-max) in
[https://github.com/docker/metadata-action/pull/353](https://togithub.com/docker/metadata-action/pull/353)
- Allow images input to be empty to output bare tags by
[@&#8203;crazy-max](https://togithub.com/crazy-max) in
[https://github.com/docker/metadata-action/pull/358](https://togithub.com/docker/metadata-action/pull/358)
- Bump [@&#8203;actions/github](https://togithub.com/actions/github)
from 5.1.1 to 6.0.0 in
[https://github.com/docker/metadata-action/pull/348](https://togithub.com/docker/metadata-action/pull/348)
- Bump [@&#8203;babel/traverse](https://togithub.com/babel/traverse)
from 7.17.3 to 7.23.2 in
[https://github.com/docker/metadata-action/pull/350](https://togithub.com/docker/metadata-action/pull/350)
- Bump
[@&#8203;docker/actions-toolkit](https://togithub.com/docker/actions-toolkit)
from 0.12.0 to 0.14.0 in
[https://github.com/docker/metadata-action/pull/349](https://togithub.com/docker/metadata-action/pull/349)
[https://github.com/docker/metadata-action/pull/357](https://togithub.com/docker/metadata-action/pull/357)
- Bump csv-parse from 5.5.0 to 5.5.2 in
[https://github.com/docker/metadata-action/pull/346](https://togithub.com/docker/metadata-action/pull/346)
- Bump semver from 7.5.3 to 7.5.4 in
[https://github.com/docker/metadata-action/pull/335](https://togithub.com/docker/metadata-action/pull/335)

**Full Changelog**:
docker/metadata-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.

---

- [ ] <!-- rebase-check -->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).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy41OS44IiwidXBkYXRlZEluVmVyIjoiMzcuOTMuMSIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate Bot added a commit to sdwilsh/sOS that referenced this pull request Apr 29, 2026
##### [\`v6\`](docker/metadata-action@v5...v6)


---
##### [\`v6.0.0\`](https://github.com/docker/metadata-action/releases/tag/v6.0.0)

- Node 24 as default runtime (requires [Actions Runner v2.327.1](https://github.com/actions/runner/releases/tag/v2.327.1) or later) by [@crazy-max](https://github.com/crazy-max) in [#605](docker/metadata-action#605)
- List inputs now preserve `#` inside values while still supporting full-line `#` comments by [@crazy-max](https://github.com/crazy-max) in [#607](docker/metadata-action#607)
- Switch to ESM and update config/test wiring by [@crazy-max](https://github.com/crazy-max) in [#602](docker/metadata-action#602)
- Bump lodash from 4.17.21 to 4.17.23 in [#588](docker/metadata-action#588)
- Bump [@actions/core](https://github.com/actions/core) from 1.11.1 to 3.0.0 in [#599](docker/metadata-action#599)
- Bump [@actions/github](https://github.com/actions/github) from 6.0.1 to 9.0.0 in [#597](docker/metadata-action#597)
- Bump [@docker/actions-toolkit](https://github.com/docker/actions-toolkit) from 0.68.0 to 0.79.0 in [#604](docker/metadata-action#604)
- Bump [@isaacs/brace-expansion](https://github.com/isaacs/brace-expansion) from 5.0.0 to 5.0.1 in [#600](docker/metadata-action#600)
- Bump semver from 7.7.3 to 7.7.4 in [#603](docker/metadata-action#603)

**Full Changelog**: <docker/metadata-action@v5.10.0...v6.0.0>

---
##### [\`v5.10.0\`](https://github.com/docker/metadata-action/releases/tag/v5.10.0)

- Bump [@docker/actions-toolkit](https://github.com/docker/actions-toolkit) from 0.66.0 to 0.68.0 in [#559](docker/metadata-action#559) [#569](docker/metadata-action#569)
- Bump js-yaml from 3.14.1 to 3.14.2 in [#564](docker/metadata-action#564)

**Full Changelog**: <docker/metadata-action@v5.9.0...v5.10.0>

---
##### [\`v5.9.0\`](https://github.com/docker/metadata-action/releases/tag/v5.9.0)

- Add `tag-names` output to return tag names without image base name by [@crazy-max](https://github.com/crazy-max) in [#553](docker/metadata-action#553)
- Bump [@babel/runtime-corejs3](https://github.com/babel/runtime-corejs3) from 7.14.7 to 7.28.2 in [#539](docker/metadata-action#539)
- Bump [@docker/actions-toolkit](https://github.com/docker/actions-toolkit) from 0.62.1 to 0.66.0 in [#555](docker/metadata-action#555)
- Bump brace-expansion from 1.1.11 to 1.1.12 in [#540](docker/metadata-action#540)
- Bump csv-parse from 5.6.0 to 6.1.0 in [#532](docker/metadata-action#532)
- Bump semver from 7.7.2 to 7.7.3 in in [#554](docker/metadata-action#554)
- Bump tmp from 0.2.3 to 0.2.5 in [#541](docker/metadata-action#541)

**Full Changelog**: <docker/metadata-action@v5.8.0...v5.9.0>

---
##### [\`v5.8.0\`](https://github.com/docker/metadata-action/releases/tag/v5.8.0)

- New `is_not_default_branch` global expression by [@crazy-max](https://github.com/crazy-max) in [#535](docker/metadata-action#535)
- Allow to match part of the git tag or value for semver/pep440 types by [@crazy-max](https://github.com/crazy-max) in [#536](docker/metadata-action#536) [#537](docker/metadata-action#537)
- Bump [@actions/github](https://github.com/actions/github) from 6.0.0 to 6.0.1 in [#523](docker/metadata-action#523)
- Bump [@docker/actions-toolkit](https://github.com/docker/actions-toolkit) from 0.56.0 to 0.62.1 in [#526](docker/metadata-action#526)
- Bump form-data from 2.5.1 to 2.5.5 in [#533](docker/metadata-action#533)
- Bump moment-timezone from 0.5.47 to 0.6.0 in [#525](docker/metadata-action#525)
- Bump semver from 7.7.1 to 7.7.2 in [#524](docker/metadata-action#524)

**Full Changelog**: <docker/metadata-action@v5.7.0...v5.8.0>

---
##### [\`v5.7.0\`](https://github.com/docker/metadata-action/releases/tag/v5.7.0)

- Global expressions support for labels and annotations by [@crazy-max](https://github.com/crazy-max) in [#489](docker/metadata-action#489)
- Support disabling outputs as environment variables by [@omus](https://github.com/omus) in [#497](docker/metadata-action#497)
- Bump [@docker/actions-toolkit](https://github.com/docker/actions-toolkit) from 0.44.0 to 0.56.0 in [#507](docker/metadata-action#507) [#509](docker/metadata-action#509)
- Bump csv-parse from 5.5.6 to 5.6.0 in [#482](docker/metadata-action#482)
- Bump moment-timezone from 0.5.46 to 0.5.47 in [#501](docker/metadata-action#501)
- Bump semver from 7.6.3 to 7.7.1 in [#504](docker/metadata-action#504)

**Full Changelog**: <docker/metadata-action@v5.6.1...v5.7.0>

---
##### [\`v5.6.1\`](https://github.com/docker/metadata-action/releases/tag/v5.6.1)

- Fix GitHub API request fallback for commit date by [@crazy-max](https://github.com/crazy-max) in [#478](docker/metadata-action#478)
- Revert to default commit SHA length of 7 by [@crazy-max](https://github.com/crazy-max) in [#480](docker/metadata-action#480)

**Full Changelog**: <docker/metadata-action@v5.6.0...v5.6.1>

---
##### [\`v5.6.0\`](https://github.com/docker/metadata-action/releases/tag/v5.6.0)

- Add `commit_date` global expression by [@trim21](https://github.com/trim21) in [#471](docker/metadata-action#471) [#475](docker/metadata-action#475)
- Increase short commit sha length to 12 for uniqueness by [@crazy-max](https://github.com/crazy-max) in [#467](docker/metadata-action#467)
- Bump [@actions/core](https://github.com/actions/core) from 1.10.1 to 1.11.1 [#460](docker/metadata-action#460)
- Bump [@docker/actions-toolkit](https://github.com/docker/actions-toolkit) from 0.16.1 to 0.44.0 [#391](docker/metadata-action#391) [#399](docker/metadata-action#399) [#413](docker/metadata-action#413) [#441](docker/metadata-action#441)
- Bump braces from 3.0.2 to 3.0.3 [#424](docker/metadata-action#424)
- Bump cross-spawn from 7.0.3 to 7.0.5 [#474](docker/metadata-action#474)
- Bump csv-parse from 5.5.5 to 5.5.6 [#412](docker/metadata-action#412)
- Bump moment-timezone from 0.5.44 to 0.5.46 [#383](docker/metadata-action#383) [#470](docker/metadata-action#470) [#459](docker/metadata-action#459)
- Bump path-to-regexp from 6.2.2 to 6.3.0 [#454](docker/metadata-action#454)
- Bump semver from 7.6.0 to 7.6.3 [#400](docker/metadata-action#400) [#411](docker/metadata-action#411) [#440](docker/metadata-action#440)
- Bump undici from 5.26.3 to 5.28.4 [#386](docker/metadata-action#386) [#402](docker/metadata-action#402)

**Full Changelog**: <docker/metadata-action@v5.5.1...v5.6.0>

---
##### [\`v5.5.1\`](https://github.com/docker/metadata-action/releases/tag/v5.5.1)

- Don't set `cwd://` prefix for local bake files by [@crazy-max](https://github.com/crazy-max) in [#382](docker/metadata-action#382)

**Full Changelog**: <docker/metadata-action@v5.5.0...v5.5.1>

---
##### [\`v5.5.0\`](https://github.com/docker/metadata-action/releases/tag/v5.5.0)

- Set `cwd://` prefix for bake files path by [@crazy-max](https://github.com/crazy-max) in [#370](docker/metadata-action#370)
- Bump [@docker/actions-toolkit](https://github.com/docker/actions-toolkit) from 0.16.0 to 0.16.1 in [#371](docker/metadata-action#371)
- Bump moment from 2.29.4 to 2.30.1 in [#373](docker/metadata-action#373)
- Bump moment-timezone from 0.5.43 to 0.5.44 in [#374](docker/metadata-action#374)

**Full Changelog**: <docker/metadata-action@v5.4.0...v5.5.0>

---
##### [\`v5.4.0\`](https://github.com/docker/metadata-action/releases/tag/v5.4.0)

- Bump [@docker/actions-toolkit](https://github.com/docker/actions-toolkit) from 0.15.0 to 0.16.0 in [#369](docker/metadata-action#369)
- Bump csv-parse from 5.5.2 to 5.5.3 in [#365](docker/metadata-action#365)

**Full Changelog**: <docker/metadata-action@v5.3.0...v5.4.0>

---
##### [\`v5.3.0\`](https://github.com/docker/metadata-action/releases/tag/v5.3.0)

- Bump [@docker/actions-toolkit](https://github.com/docker/actions-toolkit) from 0.14.0 to 0.15.0 in [#363](docker/metadata-action#363) (fixes [#362](docker/metadata-action#362))

**Full Changelog**: <docker/metadata-action@v5.2.0...v5.3.0>

---
##### [\`v5.2.0\`](https://github.com/docker/metadata-action/releases/tag/v5.2.0)

- Custom annotations support by [@crazy-max](https://github.com/crazy-max) in [#361](docker/metadata-action#361)

**Full Changelog**: <docker/metadata-action@v5.1.0...v5.2.0>

---
##### [\`v5.1.0\`](https://github.com/docker/metadata-action/releases/tag/v5.1.0)

- Annotations support by [@crazy-max](https://github.com/crazy-max) in [#352](docker/metadata-action#352)
- Split bake definition into two files by [@crazy-max](https://github.com/crazy-max) in [#353](docker/metadata-action#353)
- Allow images input to be empty to output bare tags by [@crazy-max](https://github.com/crazy-max) in [#358](docker/metadata-action#358)
- Bump [@actions/github](https://github.com/actions/github) from 5.1.1 to 6.0.0 in [#348](docker/metadata-action#348)
- Bump [@babel/traverse](https://github.com/babel/traverse) from 7.17.3 to 7.23.2 in [#350](docker/metadata-action#350)
- Bump [@docker/actions-toolkit](https://github.com/docker/actions-toolkit) from 0.12.0 to 0.14.0 in [#349](docker/metadata-action#349) [#357](docker/metadata-action#357)
- Bump csv-parse from 5.5.0 to 5.5.2 in [#346](docker/metadata-action#346)
- Bump semver from 7.5.3 to 7.5.4 in [#335](docker/metadata-action#335)

**Full Changelog**: <docker/metadata-action@v5.0.0...v5.1.0>
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.

org.opencontainers.image.source is missing from the annotations section of the manifests Feature request and discussion: support of annotations

3 participants