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.

Sign up for GitHub

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

Jump to bottom

[26.1 backport] waitExitOrRemoved: Handle context cancellation #5044

Merged
merged 1 commit into from
Apr 29, 2024
Merged

[26.1 backport] waitExitOrRemoved: Handle context cancellation #5044

merged 1 commit into from
Apr 29, 2024

Conversation

vvoland
Copy link
Contributor

@vvoland vvoland commented Apr 29, 2024 •
edited

Fix docker run printing an error.

$ docker run -d alpine sleep 3                                                                                                                                                                                                  
e28138819b6b32f8a5ce2adde83c6b08d2ea5c66ebc352f47cfb9283227f683f
ERRO[0002] error waiting for container: context canceled

Fix docker run -d ... printing an context canceled spurious error when OTEL is configured.

@vvoland
waitExitOrRemoved: Handle context cancellation
840016e 
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
@vvoland vvoland added this to the 26.1.1 milestone Apr 29, 2024
@vvoland vvoland self-assigned this Apr 29, 2024
@vvoland vvoland merged commit 1e6db5d into docker:26.1 Apr 29, 2024
218 checks passed
renovate bot added a commit to earthly/dind that referenced this pull request May 2, 2024
@renovate
Update dependency docker/docker to v26.1.1 (#49)
4f88540 
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker/docker](https://togithub.com/docker/docker) | patch | `26.1.0`
-> `26.1.1` |

---

### Release Notes

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

### [`v26.1.1`](https://togithub.com/moby/moby/releases/tag/v26.1.1)

[Compare
Source](https://togithub.com/docker/docker/compare/v26.1.0...v26.1.1)

#### 26.1.1

For a full list of pull requests and changes in this release, refer to
the relevant GitHub milestones:

- [docker/cli, 26.1.1
milestone](https://togithub.com/docker/cli/issues?q=is%3Aclosed+milestone%3A26.1.1)
- [moby/moby, 26.1.1
milestone](https://togithub.com/moby/moby/issues?q=is%3Aclosed+milestone%3A26.1.1)
- Deprecated and removed features, see [Deprecated
Features](https://togithub.com/docker/cli/blob/v26.1.1/docs/deprecated.md).
- Changes to the Engine API, see [API version
history](https://togithub.com/moby/moby/blob/v26.1.1/docs/api/version-history.md).

##### Bug fixes and enhancements

- Fix `docker run -d` printing an `context canceled` spurious error when
OTEL is configured.
[docker/cli#5044](https://togithub.com/docker/cli/pull/5044)
- Experimental environment variable `DOCKER_BRIDGE_PRESERVE_KERNEL_LL=1`
will prevent the daemon from removing the kernel-assigned link local
address on a Linux bridge.
[moby/moby#47775](https://togithub.com/moby/moby/pull/47775)
- Resolve an issue preventing container creation on hosts with a
read-only `/proc/sys/net` filesystem. If IPv6 cannot be disabled on an
interface due to this, either disable IPv6 by default on the host or
ensure `/proc/sys/net` is read-write. Otherwise, start dockerd with
`DOCKER_ALLOW_IPV6_ON_IPV4_INTERFACE=1` to bypass the error.
[moby/moby#47769](https://togithub.com/moby/moby/pull/47769)

> \[!NOTE]
> The `DOCKER_ALLOW_IPV6_ON_IPV4_INTERFACE` is added as a temporary fix
and will be phased out in a future major release after simplifying the
IPv6 enablement process.

##### Packaging updates

- Update BuildKit to
[v0.13.2](https://togithub.com/moby/buildkit/releases/tag/v0.13.2).
[moby/moby#47762](https://togithub.com/moby/moby/pull/47762)
- Update Compose to
[v2.27.0](https://togithub.com/docker/compose/releases/tag/v2.27.0).
[docker/docker-ce-packages#1017](https://togithub.com/docker/docker-ce-packaging/pull/1017)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 6am on monday" (UTC), Automerge
- At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

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

---

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

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/earthly/dind).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMzEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjMzMS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate bot added a commit to earthly/dind that referenced this pull request May 3, 2024
@renovate
Update dependency docker/docker to v26.1.1 (#52)
de268c5 
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker/docker](https://togithub.com/docker/docker) | patch | `26.1.0`
-> `26.1.1` |

---

### Release Notes

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

### [`v26.1.1`](https://togithub.com/moby/moby/releases/tag/v26.1.1)

[Compare
Source](https://togithub.com/docker/docker/compare/v26.1.0...v26.1.1)

#### 26.1.1

For a full list of pull requests and changes in this release, refer to
the relevant GitHub milestones:

- [docker/cli, 26.1.1
milestone](https://togithub.com/docker/cli/issues?q=is%3Aclosed+milestone%3A26.1.1)
- [moby/moby, 26.1.1
milestone](https://togithub.com/moby/moby/issues?q=is%3Aclosed+milestone%3A26.1.1)
- Deprecated and removed features, see [Deprecated
Features](https://togithub.com/docker/cli/blob/v26.1.1/docs/deprecated.md).
- Changes to the Engine API, see [API version
history](https://togithub.com/moby/moby/blob/v26.1.1/docs/api/version-history.md).

##### Bug fixes and enhancements

- Fix `docker run -d` printing an `context canceled` spurious error when
OTEL is configured.
[docker/cli#5044](https://togithub.com/docker/cli/pull/5044)
- Experimental environment variable `DOCKER_BRIDGE_PRESERVE_KERNEL_LL=1`
will prevent the daemon from removing the kernel-assigned link local
address on a Linux bridge.
[moby/moby#47775](https://togithub.com/moby/moby/pull/47775)
- Resolve an issue preventing container creation on hosts with a
read-only `/proc/sys/net` filesystem. If IPv6 cannot be disabled on an
interface due to this, either disable IPv6 by default on the host or
ensure `/proc/sys/net` is read-write. Otherwise, start dockerd with
`DOCKER_ALLOW_IPV6_ON_IPV4_INTERFACE=1` to bypass the error.
[moby/moby#47769](https://togithub.com/moby/moby/pull/47769)

> \[!NOTE]
> The `DOCKER_ALLOW_IPV6_ON_IPV4_INTERFACE` is added as a temporary fix
and will be phased out in a future major release after simplifying the
IPv6 enablement process.

##### Packaging updates

- Update BuildKit to
[v0.13.2](https://togithub.com/moby/buildkit/releases/tag/v0.13.2).
[moby/moby#47762](https://togithub.com/moby/moby/pull/47762)
- Update Compose to
[v2.27.0](https://togithub.com/docker/compose/releases/tag/v2.27.0).
[docker/docker-ce-packages#1017](https://togithub.com/docker/docker-ce-packaging/pull/1017)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 6am on monday" (UTC), Automerge
- At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

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

---

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

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/earthly/dind).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMzEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjMzMS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neersighted neersighted neersighted approved these changes

@laurazard laurazard Awaiting requested review from laurazard

Assignees

@vvoland vvoland

Labels
kind/bugfix PR's that fix bugs
Projects
None yet
Milestone
26.1.1
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@vvoland @neersighted