Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[26.0] save: Remove platform from config descriptor #47694

Merged
merged 1 commit into from Apr 9, 2024

Conversation

cpuguy83
Copy link
Member

@cpuguy83 cpuguy83 commented Apr 8, 2024

Cherry-pick of #47661


This was brought up by bmitch that its not expected to have a platform object in the config descriptor.
Also checked with tianon who agreed, its not wrong but is unexpected and doesn't necessarily make sense to have it there.

Also, while technically incorrect, ECR is throwing an error when it sees this.

- remove erroneous `platform` from image `config` OCI descriptor in `docker save` output

(cherry picked from commit 9160b9f)

This was brought up by bmitch that its not expected to have a platform
object in the config descriptor.
Also checked with tianon who agreed, its not _wrong_ but is unexpected
and doesn't neccessarily make sense to have it there.

Also, while technically incorrect, ECR is throwing an error when it sees
this.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 9160b9f)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
@cpuguy83 cpuguy83 changed the title save: Remove platform from config descriptor [26.0] save: Remove platform from config descriptor Apr 8, 2024
@cpuguy83 cpuguy83 added this to the 26.0.1 milestone Apr 8, 2024
Copy link
Contributor

@vvoland vvoland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM; failure is a flaky swarm test

@vvoland vvoland merged commit 23e7919 into moby:26.0 Apr 9, 2024
139 of 142 checks passed
renovate bot added a commit to earthly/dind that referenced this pull request Apr 15, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker/docker](https://togithub.com/docker/docker) | patch | `26.0.0`
-> `26.0.1` |

---

### Release Notes

<details>
<summary>docker/docker (docker/docker)</summary>

### [`v26.0.1`](https://togithub.com/moby/moby/releases/tag/v26.0.1)

[Compare
Source](https://togithub.com/docker/docker/compare/v26.0.0-rc2...v26.0.1)

#### 26.0.1

For a full list of pull requests and changes in this release, refer to
the relevant GitHub milestones:

- [docker/cli, 26.0.1
milestone](https://togithub.com/docker/cli/issues?q=is%3Aclosed+milestone%3A26.0.1)
- [moby/moby, 26.0.1
milestone](https://togithub.com/moby/moby/issues?q=is%3Aclosed+milestone%3A26.0.1)
- Deprecated and removed features, see [Deprecated
Features](https://togithub.com/docker/cli/blob/v26.0.1/docs/deprecated.md).
- Changes to the Engine API, see [API version
history](https://togithub.com/moby/moby/blob/v26.0.1/docs/api/version-history.md).

##### Bug fixes and enhancements

- Fix a regression that meant network interface specific `--sysctl`
options prevented container startup.
[moby/moby#47646](https://togithub.com/moby/moby/pull/47646)
- Remove erroneous `platform` from image `config` OCI descriptor in
`docker save` output.
[moby/moby#47694](https://togithub.com/moby/moby/pull/47694)
- containerd image store: OCI archives produced by `docker save` will
now have a non-empty `mediaType` field in `index.json`
[moby/moby#47701](https://togithub.com/moby/moby/pull/47701)
- Fix a regression that prevented the internal resolver from forwarding
requests from IPvlan L3 networks to external resolvers.
[moby/moby#47705](https://togithub.com/moby/moby/pull/47705)
- Prevent the use of external resolvers in IPvlan and Macvlan networks
created with no parent interface specified.
[moby/moby#47705](https://togithub.com/moby/moby/pull/47705)

##### Packaging updates

- Update Go runtime to 1.21.9
[moby/moby#47671](https://togithub.com/moby/moby/pull/47671),
[docker/cli#4987](https://togithub.com/docker/cli/pull/4987)
- Update Compose to [v1.26.1
](https://togithub.com/docker/compose/releases/tag/v2.26.1),
[docker/docker-ce-packaging#1009](https://togithub.com/docker/docker-ce-packaging/pull/1009)
- Update containerd to
[v1.7.15](https://togithub.com/containerd/containerd/releases/tag/v1.7.15)
(static binaries only)
[moby/moby#47692](https://togithub.com/moby/moby/pull/47692)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 6am on monday" (UTC), Automerge
- At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **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/earthly/dind).

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

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants