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
Member

@crazy-max crazy-max commented Oct 27, 2023 •
edited
Loading

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 mentioned this pull request Nov 9, 2023
Closed
3 tasks
@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 mentioned this pull request Nov 23, 2023
Merged
@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
tonistiigi
tonistiigi reviewed Nov 29, 2023
View reviewed changes
@crazy-max crazy-max force-pushed the annotations-alt branch 2 times, most recently from 83d6c9d to 71d3e79 Compare November 29, 2023 15:13
@crazy-max
annotations support
f0ad870 
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
@crazy-max
chore: update generated content
6bbe00c 
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

aerosol commented Nov 30, 2023 •
edited
Loading

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
Pin https://github.com/docker/metadata-action/
1eac207 
Ref: docker/metadata-action#352 (comment)
@aerosol aerosol mentioned this pull request Nov 30, 2023
Merged
aerosol added a commit to plausible/analytics that referenced this pull request Nov 30, 2023
@aerosol
Pin https://github.com/docker/metadata-action/ (#3575)
3905e27 
Ref: docker/metadata-action#352 (comment)
renovate bot referenced this pull request in 4m-mazi/gh-test Nov 30, 2023
@renovate
ci(deps): update docker/metadata-action action to v5.1.0 (#464)
d8197fb 
[![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
Closed
Merged
@owine owine mentioned this pull request Dec 4, 2023
Merged
arnfinn referenced this pull request in Rapporteket/docker Jan 5, 2024
@renovate
Update docker/metadata-action action to v5.4.0 (#23)
88e34cd 
[![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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tonistiigi tonistiigi tonistiigi approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

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

@crazy-max @aerosol @tonistiigi