Signed-off-by: John Howard <[email protected]>

This removes the need for an SVM in the LCOW driver to ApplyDiff.

This change relates to a fix for moby#36353

However, it found another issue, tracked by moby#37955

(cherry picked from commit bde9996)
Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: John Howard <[email protected]>
(cherry picked from commit d03ab10)
Signed-off-by: Sebastiaan van Stijn <[email protected]>

Changes: opencontainers/runc@69663f0...a00bf01

Signed-off-by: Akihiro Suda <[email protected]>
(cherry picked from commit 275044b)
Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit dd7799a)
Signed-off-by: Sebastiaan van Stijn <[email protected]>

Changes: opencontainers/runc@a00bf01...9f1e944

Signed-off-by: Kir Kolyshkin <[email protected]>
(cherry picked from commit 335736f)
Signed-off-by: Sebastiaan van Stijn <[email protected]>

In case we're running on RHEL7 kernel, which has non-working
and broken kernel memory controller, add 'nokmem' build tag
so that runc never enables kmem accounting.

For more info, see the following runc commit:
opencontainers/runc@6a2c1559684

This behavior can be overriden by having `RUNC_NOKMEM` environment
variable set (e.g. to empty value to disable setting nokmem).

Signed-off-by: Kir Kolyshkin <[email protected]>
(cherry picked from commit 8972aa9)
Signed-off-by: Sebastiaan van Stijn <[email protected]>

Fixes a potential content store bug, backported from 1.2

- v1.1.3 release notes: https://github.com/containerd/containerd/releases/tag/v1.1.3
- v1.1.4 release notes: https://github.com/containerd/containerd/releases/tag/v1.1.4

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit b3c3c7a)
Signed-off-by: Sebastiaan van Stijn <[email protected]>

Containerd should be "leading" when specifying which version of runc to use.
From the RUNC.MD document in the containerd repository
(https://github.com/containerd/containerd/blob/b1e202c32724e82779544365528a1a082
b335553/RUNC.md);

> We depend on a specific runc version when dealing with advanced features. You
> should have a specific runc build for development. The current supported runc
> commit is described in vendor.conf. Please refer to the line that starts with
> github.com/opencontainers/runc.

This patch adds a note to vendor.conf and runc.installer to describe the order
in which runc should be updated.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit da3810d)
Signed-off-by: Sebastiaan van Stijn <[email protected]>

release notes: https://github.com/containerd/containerd/releases/tag/v1.2.0

- New V2 Runtime with a stable gRPC interface for managing containers through
  external shims.
- Updated CRI Plugin, validated against Kubernetes v1.11 and v1.12, but it is
  also compatible with Kubernetes v1.10.
- Support for Kubernetes Runtime Class, introduced in Kubernetes 1.12
- A new proxy plugin configuration has been added to allow external
  snapshotters be connected to containerd using gRPC.-
- A new Install method on the containerd client allows users to publish host
  level binaries using standard container build tooling and container
  distribution tooling to download containerd related binaries on their systems.
- Add support for cleaning up leases and content ingests to garbage collections.
- Improved multi-arch image support using more precise matching and ranking
- Added a runtime `options` field for shim v2 runtime. Use the `options` field to
  config runtime specific options, e.g. `NoPivotRoot` and `SystemdCgroup` for
  runtime type `io.containerd.runc.v1`.
- Some Minor API additions
  - Add `ListStream` method to containers API. This allows listing a larger
    number of containers without hitting message size limts.
  - Add `Sync` flag to `Delete` in leases API. Setting this option will ensure
    a garbage collection completes before the removal call is returned. This can
    be used to guarantee unreferenced objects are removed from disk after a lease.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 8674930)
Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit fc0038a)
Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 7af4c90)
Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Michael Crosby <[email protected]>
(cherry picked from commit d13528c)
Signed-off-by: Sebastiaan van Stijn <[email protected]>

The previous update used a commit from master. Now that
all the fixes are backported to the containerd 1.2 release
branch, we can switch back to that branch.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 2fb5de6)
Signed-off-by: Sebastiaan van Stijn <[email protected]>