-
Notifications
You must be signed in to change notification settings - Fork 2k
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.1 backport] context list: temporarily add ContextType to JSON output #5095
Merged
thaJeztah
merged 4 commits into
docker:26.1
from
thaJeztah:26.1_backport_context_type_stub
May 31, 2024
Merged
[26.1 backport] context list: temporarily add ContextType to JSON output #5095
thaJeztah
merged 4 commits into
docker:26.1
from
thaJeztah:26.1_backport_context_type_stub
May 31, 2024
+148
−36
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 26.1 #5095 +/- ##
=======================================
Coverage 61.34% 61.35%
=======================================
Files 298 298
Lines 20688 20700 +12
=======================================
+ Hits 12691 12700 +9
- Misses 7096 7099 +3
Partials 901 901 |
Loading status checks…
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 54291dd) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The CLI does not currently expose options to add custom metadata to contexts, but contexts support them. - update test-utilities to allow setting custom metadata - update the inspect test to verify that custom metadata is included when inspecting a context. - update the import/export tests to verify that custom metadata is preserved. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 2e9eff2) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 40a1da8) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Docker Desktop currently ships with the "cloud integration" wrapper, which outputs an additional ContextType field in the JSON output. While this field is non-standard, it made its way into Visual Studio's Docker integration, which uses this to exclude "aci" and "eci" context types that are not supported by Visual Studio. This patch; - conditionally adds a ContextType field to the JSON output - but ONLY when using the default "{{json .}}" or "json" formats (which are the formats used by Visual Studio) - if the context is a "aci" or "eci" context, that type is preserved, otherwise the default "moby" type is used. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit fed9fa0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
7a91113
to
258e274
Compare
sam-thibault
approved these changes
May 31, 2024
Let's bring this one in |
renovate bot
added a commit
to earthly/dind
that referenced
this pull request
Jun 10, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/docker](https://togithub.com/docker/docker) | patch | `26.1.3` -> `26.1.4` | --- ### Release Notes <details> <summary>docker/docker (docker/docker)</summary> ### [`v26.1.4`](https://togithub.com/moby/moby/releases/tag/v26.1.4) [Compare Source](https://togithub.com/docker/docker/compare/v26.1.3...v26.1.4) #### 26.1.4 For a full list of pull requests and changes in this release, refer to the relevant GitHub milestones: - [docker/cli, 26.1.4 milestone](https://togithub.com/docker/cli/issues?q=is%3Aclosed+milestone%3A26.1.4) - [moby/moby, 26.1.4 milestone](https://togithub.com/moby/moby/issues?q=is%3Aclosed+milestone%3A26.1.4) - Deprecated and removed features, see [Deprecated Features](https://togithub.com/docker/cli/blob/v26.1.4/docs/deprecated.md). - Changes to the Engine API, see [API version history](https://togithub.com/moby/moby/blob/v26.1.4/docs/api/version-history.md). ##### Security This release updates the Go runtime to 1.21.11 which contains security fixes for: - [CVE-2024-24789] - [CVE-2024-24790] - A symlink time of check to time of use race condition during directory removal reported by Addison Crump ([@​addisoncrump](https://togithub.com/addisoncrump)). ##### Bug fixes and enhancements - Fixed an issue where promoting a node immediately after another node was demoted could cause the promotion to fail. [moby/moby#47870](https://togithub.com/moby/moby/pull/47870) - Prevent the daemon log from being spammed with `superfluous response.WriteHeader call ...` messages.. [moby/moby#47843](https://togithub.com/moby/moby/pull/47843) - Don't show empty hints when plugins return an empty hook message. [docker/cli#5083](https://togithub.com/docker/cli/pull/5083) - Added `ContextType: "moby"` to the context list/inspect output to address a compatibility issue with Visual Studio Container Tools. [docker/cli#5095](https://togithub.com/docker/cli/pull/5095) - Fix a compatibility issue with Visual Studio Container Tools. [docker/cli#5095](https://togithub.com/docker/cli/pull/5095) ##### Packaging updates - Update containerd (static binaries only) to [v1.7.17](https://togithub.com/containerd/containerd/releases/tag/v1.7.17). [moby/moby#47841](https://togithub.com/moby/moby/pull/47841) - [CVE-2024-24789], [CVE-2024-24790]: Update Go runtime to 1.21.11. [moby/moby#47904](https://togithub.com/moby/moby/pull/47904) - Update Compose to [v2.27.1](https://togithub.com/docker/compose/releases/tag/v2.27.1). [docker/docker-ce-packages#1022](https://togithub.com/docker/docker-ce-packaging/pull/1022) - Update Buildx to [v0.14.1](https://togithub.com/docker/buildx/releases/tag/v0.14.1). [docker/docker-ce-packages#1021](https://togithub.com/docker/docker-ce-packaging/pull/1021) [CVE-2024-24789]: https://togithub.com/golang/go/issues/66869 [CVE-2024-24790]: https://togithub.com/golang/go/issues/67680 </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:eyJjcmVhdGVkSW5WZXIiOiIzNy4zOTMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjM5My4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZSJdfQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate bot
added a commit
to earthly/dind
that referenced
this pull request
Jun 10, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/docker](https://togithub.com/docker/docker) | patch | `26.1.3` -> `26.1.4` | --- ### Release Notes <details> <summary>docker/docker (docker/docker)</summary> ### [`v26.1.4`](https://togithub.com/moby/moby/releases/tag/v26.1.4) [Compare Source](https://togithub.com/docker/docker/compare/v26.1.3...v26.1.4) #### 26.1.4 For a full list of pull requests and changes in this release, refer to the relevant GitHub milestones: - [docker/cli, 26.1.4 milestone](https://togithub.com/docker/cli/issues?q=is%3Aclosed+milestone%3A26.1.4) - [moby/moby, 26.1.4 milestone](https://togithub.com/moby/moby/issues?q=is%3Aclosed+milestone%3A26.1.4) - Deprecated and removed features, see [Deprecated Features](https://togithub.com/docker/cli/blob/v26.1.4/docs/deprecated.md). - Changes to the Engine API, see [API version history](https://togithub.com/moby/moby/blob/v26.1.4/docs/api/version-history.md). ##### Security This release updates the Go runtime to 1.21.11 which contains security fixes for: - [CVE-2024-24789] - [CVE-2024-24790] - A symlink time of check to time of use race condition during directory removal reported by Addison Crump ([@​addisoncrump](https://togithub.com/addisoncrump)). ##### Bug fixes and enhancements - Fixed an issue where promoting a node immediately after another node was demoted could cause the promotion to fail. [moby/moby#47870](https://togithub.com/moby/moby/pull/47870) - Prevent the daemon log from being spammed with `superfluous response.WriteHeader call ...` messages.. [moby/moby#47843](https://togithub.com/moby/moby/pull/47843) - Don't show empty hints when plugins return an empty hook message. [docker/cli#5083](https://togithub.com/docker/cli/pull/5083) - Added `ContextType: "moby"` to the context list/inspect output to address a compatibility issue with Visual Studio Container Tools. [docker/cli#5095](https://togithub.com/docker/cli/pull/5095) - Fix a compatibility issue with Visual Studio Container Tools. [docker/cli#5095](https://togithub.com/docker/cli/pull/5095) ##### Packaging updates - Update containerd (static binaries only) to [v1.7.17](https://togithub.com/containerd/containerd/releases/tag/v1.7.17). [moby/moby#47841](https://togithub.com/moby/moby/pull/47841) - [CVE-2024-24789], [CVE-2024-24790]: Update Go runtime to 1.21.11. [moby/moby#47904](https://togithub.com/moby/moby/pull/47904) - Update Compose to [v2.27.1](https://togithub.com/docker/compose/releases/tag/v2.27.1). [docker/docker-ce-packages#1022](https://togithub.com/docker/docker-ce-packaging/pull/1022) - Update Buildx to [v0.14.1](https://togithub.com/docker/buildx/releases/tag/v0.14.1). [docker/docker-ce-packages#1021](https://togithub.com/docker/docker-ce-packaging/pull/1021) [CVE-2024-24789]: https://togithub.com/golang/go/issues/66869 [CVE-2024-24790]: https://togithub.com/golang/go/issues/67680 </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:eyJjcmVhdGVkSW5WZXIiOiIzNy4zOTMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjM5My4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZSJdfQ==--> 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
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.
Docker Desktop currently ships with the "cloud integration" wrapper, which outputs an additional ContextType field in the JSON output.
While this field is non-standard, it made its way into Visual Studio's Docker integration, which uses this to exclude "aci" and "eci" context types that are not supported by Visual Studio.
This patch;
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)