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

[20.10 backport] daemon: handle EISDIR error from runtime #46694

Merged
merged 1 commit into from
Oct 21, 2023

Conversation

corhere
Copy link
Contributor

@corhere corhere commented Oct 20, 2023

Go 1.20 made a change to the behaviour of package "os/exec" which was not mentioned in the release notes:
golang/go@2b8f214

Attempts to execute a directory now return syscall.EISDIR instead of syscall.EACCESS. Check for EISDIR errors from the runtime and fudge the returned error message to maintain compatibility with existing versions of docker/cli when using a version of runc compiled with Go 1.20+.

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@corhere corhere added this to the 20.10.27 milestone Oct 20, 2023
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

Go 1.20 made a change to the behaviour of package "os/exec" which was
not mentioned in the release notes:
golang/go@2b8f214
Attempts to execute a directory now return syscall.EISDIR instead of
syscall.EACCESS. Check for EISDIR errors from the runtime and fudge the
returned error message to maintain compatibility with existing versions
of docker/cli when using a version of runc compiled with Go 1.20+.

Signed-off-by: Cory Snider <csnider@mirantis.com>
(cherry picked from commit 713e02e)
Signed-off-by: Cory Snider <csnider@mirantis.com>
@corhere corhere force-pushed the backport-20.10/runtime-eisdir branch from a4b1d78 to 9794702 Compare October 20, 2023 22:56
@thaJeztah
Copy link
Member

Failures on RS5 are the same as in #46693 (comment), and expected (should we add a Skip for RS5 in this branch?)

@thaJeztah thaJeztah merged commit c31a50b into moby:20.10 Oct 21, 2023
1 of 2 checks passed
@corhere corhere deleted the backport-20.10/runtime-eisdir branch October 21, 2023 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants