Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: containerd/containerd
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.3.8
Choose a base ref
...
head repository: containerd/containerd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.3.9
Choose a head ref
  • 5 commits
  • 13 files changed
  • 4 contributors

Commits on Nov 30, 2020

  1. Use named error return for service#StartShim 

    Signed-off-by: Ted Yu <yuzhihong@gmail.com>
    @tedyu @dmcgowan
    tedyu authored and dmcgowan committed Nov 30, 2020
    Configuration menu
    Copy the full SHA
    ea04599 View commit details
    Browse the repository at this point in the history

  2. Use path based unix socket for shims 

    This allows filesystem based ACLs for configuring access to the socket of a
shim.

Co-authored-by: Samuel Karp <skarp@amazon.com>
Signed-off-by: Samuel Karp <skarp@amazon.com>
Signed-off-by: Michael Crosby <michael@thepasture.io>
Signed-off-by: Michael Crosby <michael.crosby@apple.com>
    @crosbymichael @samuelkarp @dmcgowan
    2 people authored and dmcgowan committed Nov 30, 2020
    Configuration menu
    Copy the full SHA
    689d92c View commit details
    Browse the repository at this point in the history

  3. containerd-shim: use path-based unix socket 

    This allows filesystem-based ACLs for configuring access to the socket
of a shim.

Ported from Michael Crosby's similar patch for v2 shims.

Signed-off-by: Samuel Karp <skarp@amazon.com>
    @samuelkarp @dmcgowan
    samuelkarp authored and dmcgowan committed Nov 30, 2020
    Configuration menu
    Copy the full SHA
    85d3b5c View commit details
    Browse the repository at this point in the history

  4. Prepare 1.3.9 releases notes 

    Signed-off-by: Derek McGowan <derek@mcg.dev>
    @dmcgowan
    dmcgowan committed Nov 30, 2020
    Configuration menu
    Copy the full SHA
    25f3b29 View commit details
    Browse the repository at this point in the history

  5. Merge pull request from GHSA-36xw-fx78-c5r4 

    [release/1.3 backport] Use path based unix socket for shims
    @dmcgowan
    dmcgowan authored Nov 30, 2020
    Configuration menu
    Copy the full SHA
    ea765ab View commit details
    Browse the repository at this point in the history
Loading