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

[27.x backport] disable pseudoterminal creation #5351

Merged

Conversation

laurazard
Copy link
Member

@laurazard laurazard commented Aug 16, 2024

Backports: #5320

Fix issue with remote contexts over SSH where the CLI would allocate a pseudoterminal when connecting to the remote host, which causes issues in rare situations.

avoided the join, also did manual iteration

added test, also added reflect for the DeepEqual comparison

Signed-off-by: Archimedes Trajano <developer@trajano.net>
(cherry picked from commit f3c2c26)
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
@laurazard laurazard requested review from thaJeztah and vvoland August 16, 2024 13:12
@laurazard laurazard self-assigned this Aug 16, 2024
@laurazard laurazard added the kind/bugfix PR's that fix bugs label Aug 16, 2024
@vvoland vvoland added this to the 27.2.0 milestone Aug 16, 2024
@laurazard laurazard changed the title [backport 27.x] disable pseudoterminal creation [Backport 27.x] disable pseudoterminal creation Aug 16, 2024
@laurazard laurazard changed the title [Backport 27.x] disable pseudoterminal creation [27.x backport] disable pseudoterminal creation Aug 16, 2024
@codecov-commenter
Copy link

codecov-commenter commented Aug 16, 2024

Codecov Report

Attention: Patch coverage is 83.33333% with 1 line in your changes missing coverage. Please review.

Project coverage is 61.50%. Comparing base (d01f264) to head (83f6ca4).
Report is 2 commits behind head on 27.x.

Additional details and impacted files
@@           Coverage Diff           @@
##             27.x    #5351   +/-   ##
=======================================
  Coverage   61.49%   61.50%           
=======================================
  Files         299      299           
  Lines       20869    20875    +6     
=======================================
+ Hits        12834    12839    +5     
- Misses       7120     7121    +1     
  Partials      915      915           

@vvoland vvoland merged commit 7227402 into docker:27.x Aug 16, 2024
99 of 102 checks passed
renovate bot added a commit to earthly/dind that referenced this pull request Sep 2, 2024
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker/docker](https://redirect.github.com/docker/docker) | minor |
`27.1.2` -> `27.2.0` |

---

### Release Notes

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

###
[`v27.2.0`](https://redirect.github.com/moby/moby/releases/tag/v27.2.0)

[Compare
Source](https://redirect.github.com/docker/docker/compare/v27.1.2...v27.2.0-rc.1)

#### 27.2.0

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

- [docker/cli, 27.2.0
milestone](https://redirect.github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A27.2.0)
- [moby/moby, 27.2.0
milestone](https://redirect.github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A27.2.0)
- Deprecated and removed features, see [Deprecated
Features](https://redirect.github.com/docker/cli/blob/v27.2.0/docs/deprecated.md).
- Changes to the Engine API, see [API version
history](https://redirect.github.com/moby/moby/blob/v27.2.0/docs/api/version-history.md).

##### New

- CLI: Add support for device-code flow login when authenticating to the
official registry.
[docker/cli#5349](https://redirect.github.com/docker/cli/pull/5349)
- containerd image store: `docker image ls` now supports `--tree` flag
that shows a multiplatform-aware image list. This is experimental and
may change at any time without any backwards compatibility.
[docker/cli#5353](https://redirect.github.com/docker/cli/pull/5353)

##### API

- `GET /images/json` response now includes `Manifests` field, which
contains information about the sub-manifests included in the image
index. This includes things like platform-specific manifests and build
attestations.
The new field will only be populated if the request also sets the
`manifests` query parameter to `true`.

> \[!WARNING]
>
> This is experimental and may change at any time without any backward
compatibility.

##### Bug fixes and enhancements

- CLI: Fix issue with remote contexts over SSH where the CLI would
allocate a pseudoterminal when connecting to the remote host, which
causes issues in rare situations.
[docker/cli#5351](https://redirect.github.com/docker/cli/pull/5351)
- Fix an issue that prevented network creation with a `--ip-range`
ending on a 64-bit boundary.
[moby/moby#48326](https://redirect.github.com/moby/moby/pull/48326)
- CLI: IPv6 addresses shown by `docker ps` in port bindings are now
bracketed.
[docker/cli#5365](https://redirect.github.com/docker/cli/pull/5365)
- containerd image store: Fix early error exit from `docker load` in
cases where unpacking the image would fail.
[moby/moby#48376](https://redirect.github.com/moby/moby/pull/48376)
- containerd image store: Fix the previous image not being persisted as
dangling after `docker pull`.
[moby/moby#48380](https://redirect.github.com/moby/moby/pull/48380)

##### Packaging updates

- Update BuildKit to
[v0.15.2](https://redirect.github.com/moby/buildkit/releases/tag/v0.15.2).
[moby/moby#48341](https://redirect.github.com/moby/moby/pull/48341)
- Update Compose to
[v2.29.2](https://redirect.github.com/docker/compose/releases/tag/v2.29.2).
[docker/docker-ce-packaging#1050](https://redirect.github.com/docker/docker-ce-packaging/pull/1050)
- The canonical source for the dockerd(8) man page has been moved back
to the same source tree as dockerd itself.
[moby/moby#48378](https://redirect.github.com/moby/moby/pull/48378)
- Update containerd to
[v1.7.21](https://redirect.github.com/containerd/containerd/releases/tag/v1.7.21).
[moby/moby#48383](https://redirect.github.com/moby/moby/pull/48383),
[docker/containerd-packaging#389](https://redirect.github.com/docker/containerd-packaging/pull/389)

</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 was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/earthly/dind).

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

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 Sep 2, 2024
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker/docker](https://redirect.github.com/docker/docker) | minor |
`27.1.2` -> `27.2.0` |

---

### Release Notes

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

###
[`v27.2.0`](https://redirect.github.com/moby/moby/releases/tag/v27.2.0)

[Compare
Source](https://redirect.github.com/docker/docker/compare/v27.1.2...v27.2.0-rc.1)

#### 27.2.0

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

- [docker/cli, 27.2.0
milestone](https://redirect.github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A27.2.0)
- [moby/moby, 27.2.0
milestone](https://redirect.github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A27.2.0)
- Deprecated and removed features, see [Deprecated
Features](https://redirect.github.com/docker/cli/blob/v27.2.0/docs/deprecated.md).
- Changes to the Engine API, see [API version
history](https://redirect.github.com/moby/moby/blob/v27.2.0/docs/api/version-history.md).

##### New

- CLI: Add support for device-code flow login when authenticating to the
official registry.
[docker/cli#5349](https://redirect.github.com/docker/cli/pull/5349)
- containerd image store: `docker image ls` now supports `--tree` flag
that shows a multiplatform-aware image list. This is experimental and
may change at any time without any backwards compatibility.
[docker/cli#5353](https://redirect.github.com/docker/cli/pull/5353)

##### API

- `GET /images/json` response now includes `Manifests` field, which
contains information about the sub-manifests included in the image
index. This includes things like platform-specific manifests and build
attestations.
The new field will only be populated if the request also sets the
`manifests` query parameter to `true`.

> \[!WARNING]
>
> This is experimental and may change at any time without any backward
compatibility.

##### Bug fixes and enhancements

- CLI: Fix issue with remote contexts over SSH where the CLI would
allocate a pseudoterminal when connecting to the remote host, which
causes issues in rare situations.
[docker/cli#5351](https://redirect.github.com/docker/cli/pull/5351)
- Fix an issue that prevented network creation with a `--ip-range`
ending on a 64-bit boundary.
[moby/moby#48326](https://redirect.github.com/moby/moby/pull/48326)
- CLI: IPv6 addresses shown by `docker ps` in port bindings are now
bracketed.
[docker/cli#5365](https://redirect.github.com/docker/cli/pull/5365)
- containerd image store: Fix early error exit from `docker load` in
cases where unpacking the image would fail.
[moby/moby#48376](https://redirect.github.com/moby/moby/pull/48376)
- containerd image store: Fix the previous image not being persisted as
dangling after `docker pull`.
[moby/moby#48380](https://redirect.github.com/moby/moby/pull/48380)

##### Packaging updates

- Update BuildKit to
[v0.15.2](https://redirect.github.com/moby/buildkit/releases/tag/v0.15.2).
[moby/moby#48341](https://redirect.github.com/moby/moby/pull/48341)
- Update Compose to
[v2.29.2](https://redirect.github.com/docker/compose/releases/tag/v2.29.2).
[docker/docker-ce-packaging#1050](https://redirect.github.com/docker/docker-ce-packaging/pull/1050)
- The canonical source for the dockerd(8) man page has been moved back
to the same source tree as dockerd itself.
[moby/moby#48378](https://redirect.github.com/moby/moby/pull/48378)
- Update containerd to
[v1.7.21](https://redirect.github.com/containerd/containerd/releases/tag/v1.7.21).
[moby/moby#48383](https://redirect.github.com/moby/moby/pull/48383),
[docker/containerd-packaging#389](https://redirect.github.com/docker/containerd-packaging/pull/389)

</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 was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/earthly/dind).

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

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
Labels
kind/bugfix PR's that fix bugs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants