Merge pull request #129 from thaJeztah/18.09_backport_bump_containerd_vendoring

[18.09 backport] update containerd vendoring to v1.2.1
Upstream-commit: b54b6d145ccfd5a47b774cd4205b48b3ff090afa
Component: engine
This commit is contained in:
Andrew Hsu
2018-12-10 13:54:05 +00:00
committed by GitHub
17 changed files with 75 additions and 42 deletions
@@ -3,7 +3,7 @@
# LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When
# updating the binary version, consider updating github.com/docker/libnetwork
# in vendor.conf accordingly
LIBNETWORK_COMMIT=8bc51fd276b549b106dbc7bf8ab18b3a01d66e64 # bump_18.09 branch
LIBNETWORK_COMMIT=2cfbf9b1f98162a55829a21cc603c76072a75382 # bump_18.09 branch
install_proxy() {
case "$1" in