Skip to content

When retrying to resolveOrCreateNetwork, retry with a valid network name#12422

Merged
ndeloof merged 1 commit intodocker:mainfrom
gtardif:fix_flaky_network_resolution
Jan 6, 2025
Merged

When retrying to resolveOrCreateNetwork, retry with a valid network name#12422
ndeloof merged 1 commit intodocker:mainfrom
gtardif:fix_flaky_network_resolution

Conversation

@gtardif
Copy link
Copy Markdown
Contributor

@gtardif gtardif commented Dec 24, 2024

What I did

compose sometimes fail to start a basic stack with a network error
Network tmp_default was found but has incorrect label com.docker.compose.network set to "default" (expected "")

The same compose file might succeed or fail randomly. Given the error message, when it fails the network name param is empty here, that is very likely due to the retry that passes an empty string instead of the actual name, passed in the first invocation (and the error message indicates that resolution would succeed if the name default was passed as expected).

This PR passes the same name param when retrying as in the initial invocation (I might miss some context, if there was a specific reason to pass empty on the retry?)

Related issue

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

octupus

@ndeloof ndeloof merged commit 571a1af into docker:main Jan 6, 2025
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Jan 8, 2025
This MR contains the following updates:

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

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.32.2`](https://github.com/docker/compose/releases/tag/v2.32.2)

[Compare Source](docker/compose@v2.32.1...v2.32.2)

#### What's Changed

##### ✨ Improvements

-   Add `--pull` to run command by [@&#8203;glours](https://github.com/glours)  [(12397)](docker/compose#12397)

##### 🐛 Fixes

-   Only check bind mount conflict if sync action is involved by [@&#8203;ndeloof](https://github.com/ndeloof) [(12409)](docker/compose#12409)
-   When retrying to resolveOrCreateNetwork, retry with a valid network name by [@&#8203;gtardif](https://github.com/gtardif)  [(12422)](docker/compose#12422)
-   checkExpectedVolumes must ignore anonymous volumes by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12410

##### 🔧  Internal

-   Gofumpt all the things by [@&#8203;ndeloof](https://github.com/ndeloof) [(12392)](docker/compose#12392)
-   Use the 3 latest major versions of the engine to run e2e step by [@&#8203;glours](https://github.com/glours) [(12401)](docker/compose#12401)
-   Replace tibdex/github-app-token by official GitHub create-github-app-token by [@&#8203;glours](https://github.com/glours) [(12411)](docker/compose#12411)

##### ⚙️ Dependencies

-   Bump Golang version to `v1.22.10` and update CI actions by [@&#8203;glours](https://github.com/glours) [(12399)](docker/compose#12399)
-   Bump golang.org/x/net to `v0.33.0` to fix potential security issue by [@&#8203;glours](https://github.com/glours)  [(12405)](docker/compose#12405)
-   Bump `compose-go` to `v2.4.7` by [@&#8203;glours](https://github.com/glours) [(12438)](docker/compose#12438)

**Full Changelog**: docker/compose@v2.32.1...v2.32.2

</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 MR becomes conflicted, 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:eyJjcmVhdGVkSW5WZXIiOiIzOS45MS40IiwidXBkYXRlZEluVmVyIjoiMzkuOTEuNCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90Il19-->
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.

2 participants