chore: backport main for rc1 #1843
Merged
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
Closes: #1625 --------- Co-authored-by: CHAMI Rachid <chamirachid1@gmail.com> Co-authored-by: Rootul P <rootulp@gmail.com>
<!-- Please read and fill out this form before submitting your PR. Please make sure you have reviewed our contributors guide before submitting your first PR. --> ## Overview <!-- Please provide an explanation of the PR, including the appropriate context, background, goal, and rationale. If there is an issue with this information, please provide a tl;dr and link the issue. --> QGB module go docs reformat Closes: #1819 ## Checklist <!-- Please complete the checklist to ensure that the PR is ready to be reviewed. IMPORTANT: PRs should be left in Draft until the below checklist is completed. --> - [ ] New and updated code has appropriate documentation - [ ] New and updated code has new and/or updated testing - [ ] Required CI checks are passing - [ ] Visual proof for any user facing features like CLI or documentation updates - [ ] Linked issues closed with keywords --------- Co-authored-by: Rootul P <rootulp@gmail.com>
rach-id
approved these changes
May 26, 2023
rach-id
approved these changes
May 26, 2023
|
@MSevey when you get the chance can we have branch rules or something that require 2 reviews for release branches if we don't already? looks like I could merge this already with only 1 review |
it is enabled, the problem is that this branch is called It should be |
I see, the thinking there was that we would have a single release branch per major version, not minor, since afaiu we're not planning on maintaining old minor releases. are we planning on having and maintaining release branches for each minor release? such as
|
…o 24.0.0+incompatible (#1780) Bumps [github.com/docker/docker](https://github.com/docker/docker) from 23.0.6+incompatible to 24.0.0+incompatible. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/docker/docker/releases">github.com/docker/docker's releases</a>.</em></p> <blockquote> <h2>v24.0.0</h2> <h2>24.0.0</h2> <p>For a full list of pull requests and changes in this release, refer to the relevant GitHub milestones:</p> <ul> <li><a href="https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A24.0.0">docker/cli, 24.0.0 milestone</a></li> <li><a href="https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A24.0.0">moby/moby, 24.0.0 milestone</a></li> </ul> <h3>New</h3> <ul> <li>Introduce experimental support for containerd as the content store (replacing the existing storage drivers). <a href="https://redirect.github.com/moby/moby/pull/43735">moby/moby#43735</a>, <a href="https://github.com/moby/moby/pulls?q=is%3Apr+is%3Amerged+milestone%3A24.0.0+-label%3Aprocess%2Fcherry-picked+label%3Acontainerd-integration+">other moby/moby pull requests</a></li> <li>The <code>--host</code> CLI flag now supports a path component in a <code>ssh://</code> host address, allowing use of an alternate socket path without configuration on the remote host. <a href="https://redirect.github.com/docker/cli/pull/4073">docker/cli#4073</a></li> <li>The <code>docker info</code> CLI command now reports a version and platform field. <a href="https://redirect.github.com/docker/cli/pull/4180">docker/cli#4180</a></li> <li>Introduce the daemon flag <code>--default-network-opt</code> to configure options for newly created networks. <a href="https://redirect.github.com/moby/moby/pull/43197">moby/moby#43197</a></li> <li>Restrict access to <code>AF_VSOCK</code> in the <code>socket(2)</code> family of syscalls in the default seccomp profile. <a href="https://redirect.github.com/moby/moby/pull/44562">moby/moby#44562</a></li> <li>Introduce support for setting OCI runtime annotations on containers. <a href="https://redirect.github.com/docker/cli/pull/4156">docker/cli#45025</a>, <a href="https://redirect.github.com/moby/moby/pull/45025">moby/moby#45025</a></li> <li>Alternative runtimes can now be configured in <code>daemon.json</code>, enabling runtime names to be aliased and options to be passed. <a href="https://redirect.github.com/moby/moby/pull/45032">moby/moby#45032</a></li> <li>The <code>docker-init</code> binary will now be discovered in FHS-compliant libexec directories, in addition to the <code>PATH</code>. <a href="https://redirect.github.com/moby/moby/pull/45198">moby/moby#45198</a></li> <li>API: Surface the daemon-level <code>--no-new-privileges</code> in <code>GET /info</code>. <a href="https://redirect.github.com/moby/moby/pull/45320">moby/moby#45320</a></li> </ul> <h3>Removed</h3> <ul> <li><code>docker info</code> no longer reports <code>IndexServiceAddress</code>. <a href="https://redirect.github.com/docker/cli/pull/4204">docker/cli#4204</a></li> <li>libnetwork: Remove fallback code for obsolete kernel versions. <a href="https://redirect.github.com/moby/moby/pull/44684">moby/moby#44684</a>, <a href="https://redirect.github.com/moby/moby/pull/44802">moby/moby#44802</a></li> <li>libnetwork: Remove unused code related to classic Swarm. <a href="https://redirect.github.com/moby/moby/pull/44965">moby/moby#44965</a></li> <li>libnetwork: Remove usage of the <code>xt_u32</code> kernel module from encrypted Swarm overlay networks. <a href="https://redirect.github.com/moby/moby/pull/45281">moby/moby#45281</a></li> <li>Remove support for buildkit's deprecated <code>buildinfo</code> in favor of standard provenance attestations. <a href="https://redirect.github.com/moby/moby/pull/45097">moby/moby#45097</a></li> <li>Remove the deprecated AUFS and legacy <code>overlay</code> storage drivers. <a href="https://redirect.github.com/moby/moby/pull/45342">moby/moby#45342</a>, <a href="https://redirect.github.com/moby/moby/pull/45359">moby/moby#</a></li> <li>Remove the deprecated <code>overlay2.override_kernel_check</code> storage driver option. <a href="https://redirect.github.com/moby/moby/pull/45368">moby/moby#45368</a></li> <li>Remove workarounds for obsolete versions of <code>apparmor_parser</code> from the AppArmor profiles. <a href="https://redirect.github.com/moby/moby/pull/45500">moby/moby#45500</a></li> <li>API: <code>GET /images/json</code> no longer represents empty RepoTags and RepoDigests as<code><none>:<none></code>/<code><none>@<none></code>. Empty arrays are be returned instead on API >= 1.43. <a href="https://redirect.github.com/moby/moby/pull/45068">moby/moby#45068</a></li> </ul> <h3>Deprecated</h3> <ul> <li>Deprecate the <code>--oom-score-adjust</code> daemon option. <a href="https://redirect.github.com/moby/moby/pull/45315">moby/moby#45315</a></li> <li>API: Deprecate the <code>VirtualSize</code> field in <code>GET /images/json</code> and <code>GET /images/{id}/json</code>. <a href="https://redirect.github.com/moby/moby/pull/45346">moby/moby#45346</a></li> </ul> <h3>Bug fixes and enhancements</h3> <ul> <li>The <code>docker stack</code> command no longer validates the <code>build</code> section of Compose files. <a href="https://redirect.github.com/docker/cli/pull/4214">docker/cli#4214</a></li> <li>Fix lingering healthcheck processes after timeout is reached. <a href="https://redirect.github.com/moby/moby/pull/43739">moby/moby#43739</a></li> <li>Reduce the overhead of container startup when using the <code>overlay2</code> storage driver. <a href="https://redirect.github.com/moby/moby/pull/44285">moby/moby#44285</a></li> <li>API: Handle multiple <code>before=</code> and <code>since=</code> filters in <code>GET /images</code>. <a href="https://redirect.github.com/moby/moby/pull/44503">moby/moby#44503</a></li> <li>Fix numerous bugs in the embedded DNS resolver implementation used by user-defined networks. <a href="https://redirect.github.com/moby/moby/pull/44664">moby/moby#44664</a></li> <li>Add <code>execDuration</code> field to the map of event attributes. <a href="https://redirect.github.com/moby/moby/pull/45494">moby/moby#45494</a></li> <li>Swarm-level networks can now be created with the Windows <code>internal</code>, <code>l2bridge</code>, and <code>nat</code> drivers. <a href="https://redirect.github.com/moby/swarmkit/pull/3121">moby/swarmkit#3121</a>, <a href="https://redirect.github.com/moby/moby/pull/45291">moby/moby#45291</a></li> </ul> <h3>Packaging updates</h3> <ul> <li>Update Go to <code>1.20.4</code>. <a href="https://redirect.github.com/docker/cli/pull/4253">docker/cli#4253</a>, <a href="https://redirect.github.com/moby/moby/pull/45456">moby/moby#45456</a></li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/moby/moby/commit/1331b8c39a601c77d678f3e03f3f39cb07aa5f76"><code>1331b8c</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/45537">#45537</a> from thaJeztah/24.0_backport_containerd_binary_1.7.1</li> <li><a href="https://github.com/moby/moby/commit/907f037141b41d0a96daa379fd2cbd0b0eee7569"><code>907f037</code></a> update containerd binary to v1.7.1</li> <li><a href="https://github.com/moby/moby/commit/a5b597ea51348f5f922fdd2167cba8f57c6961f3"><code>a5b597e</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/45531">#45531</a> from rumpl/24.0_backport_fix-empty-auth-pull</li> <li><a href="https://github.com/moby/moby/commit/8bbfa3274109a240952c08a2263d0cd256a27311"><code>8bbfa32</code></a> c8d: The authorizer needs to be set even if AuthConfig is empty</li> <li><a href="https://github.com/moby/moby/commit/807e415260380b55af87ef50d72abcef9466e43b"><code>807e415</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/45526">#45526</a> from laurazard/backport-classic-builder</li> <li><a href="https://github.com/moby/moby/commit/8587a1c617dae69474e8e3847d5fd799de156da6"><code>8587a1c</code></a> c8d/builder: implement cache</li> <li><a href="https://github.com/moby/moby/commit/9717369913214e9fbf1d656af24092d65a1e0102"><code>9717369</code></a> c8d: implement classic builder</li> <li><a href="https://github.com/moby/moby/commit/ed0c147c8ffd969487ecc1afb74832f8aa4e798e"><code>ed0c147</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/45523">#45523</a> from thaJeztah/24.0_backport_cleanup_reexec_inits</li> <li><a href="https://github.com/moby/moby/commit/90be9ab80267fbed15503c9030b864151f73503c"><code>90be9ab</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/45525">#45525</a> from thaJeztah/24.0_backport_c8d_authconfig_default</li> <li><a href="https://github.com/moby/moby/commit/d73f7031e0cb866fae12e582a6846114303a10fa"><code>d73f703</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/45521">#45521</a> from thaJeztah/24.0_backport_vendor_distribution_v2...</li> <li>Additional commits viewable in <a href="https://github.com/docker/docker/compare/v23.0.6...v24.0.0">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Evan Forbes <42654277+evan-forbes@users.noreply.github.com> Co-authored-by: Rootul P <rootulp@gmail.com>
rootulp
approved these changes
May 26, 2023
|
I don't think we need to maintain any minor release that is not the latest. We might still need to have branches v1.1.x and v1.2.x. Imagine we're working on a new minor release and there's a bug on the main network. We want to patch the version in current use. But anytime a user wants to upgrade. It should always be to the latest version within the major version not within the minor |
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.
Overview
cherry picks all changes from main for the v1.x branch, including #1842
should be merged or rebased
Checklist