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

fix error message when detach is implied by wait #12566

Merged
merged 1 commit into from
Feb 21, 2025

Conversation

ndeloof
Copy link
Contributor

@ndeloof ndeloof commented Feb 21, 2025

fixes #12565

@ndeloof ndeloof requested a review from a team as a code owner February 21, 2025 08:40
@ndeloof ndeloof requested a review from glours February 21, 2025 08:40
Copy link
Contributor

@glours glours left a comment

Choose a reason for hiding this comment

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

LGTM

@glours glours enabled auto-merge (rebase) February 21, 2025 08:45
@glours glours merged commit b27f56e into docker:main Feb 21, 2025
25 checks passed
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.

Confusing message when combining --watch --wait flags together
2 participants