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.2.3
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.2.4
Choose a head ref
  • 16 commits
  • 232 files changed
  • 7 contributors

Commits on Feb 8, 2019

  1. Bump github.com/docker/distribution to 0d3efadf0154c2b8a4e7b6621fff98… 

    …09655cc580

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

  2. Use distribution's reference.ParseDockerRef 

    Using the cri utility caused other project to have
containerd/cri as a dependency, only for this utility.

The new `reference.ParseDockerRef` function does the
same (other than having a different name).

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

  3. Merge pull request #2995 from thaJeztah/1.2_backport_remove_normalize… 

    …_image_ref

[release/1.2 backport] Use distribution's reference.ParseDockerRef
    @estesp
    estesp authored Feb 8, 2019
    Configuration menu
    Copy the full SHA
    74133fa View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2019

  1. Update runc to 6635b4f0c6af3810594d2770f662f34ddc15b40d (CVE-2019-5736) 

    Includes opencontainers/runc@6635b4f,
which fixes a vulnerability in runc that allows a container escape (CVE-2019-5736)

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

  2. Merge pull request #2998 from thaJeztah/1.2_backport_bump_runc_cve_20… 

    …19-5736

[release/1.2 backport] Update runc to 6635b4f (CVE-2019-5736)
    @dmcgowan
    dmcgowan authored Feb 11, 2019
    Configuration menu
    Copy the full SHA
    583472f View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2019

  1. Fix Makefile to run protobuild on paths with spaces 

    Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
(cherry picked from commit 7d70d2b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @jterry75 @thaJeztah
    jterry75 authored and thaJeztah committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    7908802 View commit details
    Browse the repository at this point in the history

  2. Add io.containerd.runhcs.v1 shim proto options 

    Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
(cherry picked from commit ec3dbd1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @jterry75 @thaJeztah
    jterry75 authored and thaJeztah committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    30ca1c5 View commit details
    Browse the repository at this point in the history

  3. Implement io.containerd.runhcs.v1 shim log opts 

    Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
(cherry picked from commit a33ad40)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @jterry75 @thaJeztah
    jterry75 authored and thaJeztah committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    d40cc95 View commit details
    Browse the repository at this point in the history

  4. Forward ctr.exe --debug as io.containerd.runhcs.v1 options 

    Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
(cherry picked from commit 354dab0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @jterry75 @thaJeztah
    jterry75 authored and thaJeztah committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    6a8198b View commit details
    Browse the repository at this point in the history

  5. Update runhcs options to include CRI Sandbox support 

    Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
(cherry picked from commit bc76e01)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @jterry75 @thaJeztah
    jterry75 authored and thaJeztah committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    84a14ae View commit details
    Browse the repository at this point in the history

  6. Windows:NewDirectIOFromFIFOSet 

    Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit 90caf6f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    John Howard authored and thaJeztah committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    dfa19e5 View commit details
    Browse the repository at this point in the history

  7. [release/1.2] update containerd/cri to da0c016c830b2ea97fd1d737c49a56… 

    …8a816bf964

includes backports of:

- containerd/cri#1042 Set /etc/hostname (fixes containerd/cri#1041)
- containerd/cri#1045 Fix env performance issue (fixes containerd/cri#1044)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    3cbdf9e View commit details
    Browse the repository at this point in the history

  8. Merge pull request #3013 from thaJeztah/1.2_backport_windows_changes 

    [release/1.2 backport] Windows changes for moby runtime
    @crosbymichael
    crosbymichael authored Feb 13, 2019
    Configuration menu
    Copy the full SHA
    7828610 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #3014 from thaJeztah/1.2_bump_cri 

    [release/1.2] update containerd/cri to da0c016c830b2ea97fd1d737c49a568a816bf964
    @crosbymichael
    crosbymichael authored Feb 13, 2019
    Configuration menu
    Copy the full SHA
    2095626 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2019

  1. Prepare v1.2.4 release 

    Updated vendor of runc to fix CVE-2019-5736. Update CRI to include a few
additional fixes.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
    @estesp @dmcgowan
    estesp authored and dmcgowan committed Feb 14, 2019
    Configuration menu
    Copy the full SHA
    5d1443d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3002 from estesp/prepare-1.2.4-release 

    Prepare v1.2.4 release
    @dmcgowan
    dmcgowan authored Feb 14, 2019
    Configuration menu
    Copy the full SHA
    e6b3f56 View commit details
    Browse the repository at this point in the history
Loading