Skip to content

report cancelled pull after another one failed #12840

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

Merged
merged 1 commit into from
May 19, 2025

Conversation

ndeloof
Copy link
Contributor

@ndeloof ndeloof commented May 15, 2025

What I did

As a pull error occurs, concurrent pull get ctx cancelled, but http/transport returns the context.Cause (https://github.com/golang/go/blob/master/src/net/http/transport.go#L669) and we don't get a "context cancelled" error but the original error to cancel the errgroup.

As a workaround, detect context is cancelled and report pull has been interrupted

Related issue
fixes #12767

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

$ cat compose.yaml 
services:
  test:
    image: alpine
  fail:
    image: none

$ docker compose  pull
[+] Pulling 2/2
 ✘ fail Error   pull access denied for none, repository does not exist or may require 'docker login'                                                                   0.8s 
 ! test Warning Interrupted                                                                                                                                            0.8s 
Error response from daemon: pull access denied for none, repository does not exist or may require 'docker login'
@ndeloof ndeloof requested a review from a team as a code owner May 15, 2025 17:01
@ndeloof ndeloof requested a review from glours May 15, 2025 17:01
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
@ndeloof ndeloof force-pushed the interrupt_error branch from 074d43e to 7741a8b Compare May 15, 2025 17:35
@glours glours merged commit 7f91018 into docker:main May 19, 2025
26 checks passed
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request May 20, 2025
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker/compose](https://github.com/docker/compose) | patch | `v2.36.0` -> `v2.36.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.36.1`](https://github.com/docker/compose/releases/tag/v2.36.1)

[Compare Source](docker/compose@v2.36.0...v2.36.1)

#### What's Changed

##### ✨ Improvements

-   Provider.options can be an array by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12819
-   Set provider environment by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12817
-   Add support of `debug` messages in the communication between Compose … by [@&#8203;glours](https://github.com/glours) in docker/compose#12826
-   Introduce config `--lock-image-digests` by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12843

##### 🐛 Fixes

-   Skip push step for provider services by [@&#8203;glours](https://github.com/glours) in docker/compose#12818
-   Provider info by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12820
-   Append `.exe` to provider name doing executable lookup on windows by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12832
-   Fix quiet option when using COMPOSE_BAKE=1 by [@&#8203;AnvarU](https://github.com/AnvarU) in docker/compose#12838
-   Do not throw an error on build with provider services by [@&#8203;glours](https://github.com/glours) in docker/compose#12842
-   Report cancelled pull after another one failed by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12840
-   Ensure build dependencies are enabled by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12824

##### 🔧  Internal

-   Simplification by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12811
-   Remove Docker EULA licensing which isn't relevant by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12829
-   Remove convert alias from config command by [@&#8203;glours](https://github.com/glours) in docker/compose#12850

##### ⚙️ Dependencies

-   Build(deps): bump github.com/containerd/containerd/v2 from 2.0.5 to 2.1.0 by [@&#8203;dependabot](https://github.com/dependabot) in docker/compose#12813
-   Build(deps): bump google.golang.org/grpc from 1.72.0 to 1.72.1 by [@&#8203;dependabot](https://github.com/dependabot) in docker/compose#12837
-   Bump compose-go to v2.6.3 by [@&#8203;glours](https://github.com/glours) in docker/compose#12849

**Full Changelog**: docker/compose@v2.36.0...v2.36.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:eyJjcmVhdGVkSW5WZXIiOiI0MC4xNS4wIiwidXBkYXRlZEluVmVyIjoiNDAuMTUuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90Il19-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants