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

[23.0 backports] assorted backports #4004

Merged
merged 4 commits into from Feb 6, 2023
Merged

[23.0 backports] assorted backports #4004

merged 4 commits into from Feb 6, 2023

Commits on Feb 6, 2023

  1. Fix bad ThrottleDevice path 

    Fixes moby/moby#44904.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
(cherry picked from commit 56051b8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @akerouanton @thaJeztah
    akerouanton authored and thaJeztah committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    53ed25d View commit details
    Browse the repository at this point in the history

  2. cli/command/container: exit 126 on EISDIR error 

    The error returned from "os/exec".Command when attempting to execute a
directory has been changed from syscall.EACCESS to syscall.EISDIR on
Go 1.20. golang/go@2b8f214
Consequently, any runc runtime built against Go 1.20 will return an
error containing 'is a directory' and not 'permission denied'. Update
the string matching so the CLI exits with status code 126 on 'is a
directory' errors (EISDIR) in addition to 'permission denied' (EACCESS).

Signed-off-by: Cory Snider <csnider@mirantis.com>
(cherry picked from commit 9b5ceb5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @corhere @thaJeztah
    corhere authored and thaJeztah committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    168f1b5 View commit details
    Browse the repository at this point in the history

  3. vendor: github.com/containerd/containerd v1.6.16 

    no changes in vendored code

full diff: containerd/containerd@v1.6.15...v1.6.16

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5195db1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    0cd15ab View commit details
    Browse the repository at this point in the history

  4. vendor: github.com/docker/docker v23.0.0 

    - client: improve error messaging on crash

full diff: moby/moby@v23.0.0-rc.3...v23.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit bbebeba)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    14aac2c View commit details
    Browse the repository at this point in the history