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

add support for gw_priority, enable_ipv4 (requires docker v28.0) #12570

Merged
merged 1 commit into from
Feb 21, 2025

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Feb 21, 2025

relates to:

This adds support for the GwPriority API field in API v1.48 (docker v28.0).
It can be set on both docker container run and docker network connect.

This option is used by the Engine to determine which network provides
the default gateway for a container.

It also adds support for enable_ipv4, which allows enabling (default)
or disabling IPv4 address assignment for a network.

What I did

Related issue

(not mandatory) A picture of a cute animal, if possible in relation to what you did

@thaJeztah thaJeztah requested a review from a team as a code owner February 21, 2025 14:40
@thaJeztah thaJeztah requested review from ndeloof and glours February 21, 2025 14:40
@@ -1325,6 +1328,7 @@ func (s *composeService) resolveOrCreateNetwork(ctx context.Context, project *ty
Attachable: n.Attachable,
IPAM: ipam,
EnableIPv6: n.EnableIPv6,
EnableIPv4: n.EnableIPv4,
Copy link
Member Author

Choose a reason for hiding this comment

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

Oh, missed there were more, I should probably mention this one as well; let me see if I can find a PR with a description

Copy link
Member Author

Choose a reason for hiding this comment

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

cc @robmry if the description looks good 🙈

This adds support for the GwPriority API field in API v1.48 (docker v28.0).
It can be set on both docker container run and docker network connect.

This option is used by the Engine to determine which network provides
the default gateway for a container.

It also adds support for enable_ipv4, which allows enabling (default)
or disabling IPv4 address assignment for a network.

Co-authored-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the add_gateway_priority branch from 3876a65 to ad1fb0a Compare February 21, 2025 14:46
@thaJeztah thaJeztah changed the title add support for gateway-priority (requires docker v28.0) add support for gw_priority, enable_ipv4 (requires docker v28.0) Feb 21, 2025
@ndeloof ndeloof enabled auto-merge (rebase) February 21, 2025 14:50
@ndeloof ndeloof merged commit da2eff4 into docker:main Feb 21, 2025
25 checks passed
@thaJeztah thaJeztah deleted the add_gateway_priority branch February 21, 2025 14:54
@thaJeztah
Copy link
Member Author

Thanks everyone!

@thaJeztah thaJeztah mentioned this pull request Feb 21, 2025
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Feb 26, 2025
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker/compose](https://github.com/docker/compose) | patch | `v2.33.0` -> `v2.33.1` |

MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot).

**Proposed changes to behavior should be submitted there as MRs.**

---

### Release Notes

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

### [`v2.33.1`](https://github.com/docker/compose/releases/tag/v2.33.1)

[Compare Source](docker/compose@v2.33.0...v2.33.1)

#### What's Changed

##### ✨ Improvements

-   Add support for gw_priority, enable_ipv4 (requires docker v28.0) by [@&#8203;thaJeztah](https://github.com/thaJeztah) in docker/compose#12570

##### 🐛 Fixes

-   Run watch standalone if menu fails to start by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12536
-   Report error using non-file secret|config with read-only service by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12531
-   Don't display bake suggestion when using --progress with quiet or json option by [@&#8203;glours](https://github.com/glours) in docker/compose#12561
-   Fix pull --parallel and --no-parallel deprecation warnings missing by [@&#8203;maxproske](https://github.com/maxproske) in docker/compose#12555
-   Fix error message when detach is implied by wait by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12566

##### ⚙️ Dependencies

-   build(deps): bump github.com/spf13/cobra from 1.8.1 to 1.9.1 by [@&#8203;dependabot](https://github.com/dependabot) in docker/compose#12556
-   build(deps): bump google.golang.org/grpc from 1.68.1 to 1.70.0 by [@&#8203;dependabot](https://github.com/dependabot) in docker/compose#12494
-   go.mod: update to docker v28.0.0 by [@&#8203;thaJeztah](https://github.com/thaJeztah) in docker/compose#12545

**Full Changelog**: docker/compose@v2.33.0...v2.33.1

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this MR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box

---

This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xODAuMiIsInVwZGF0ZWRJblZlciI6IjM5LjE4MC4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
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.

4 participants