Merge pull request #187 from andrewhsu/to

[18.09] Update proxy commit for shutdown timeouts
Upstream-commit: fc32916152b333dcf8ade021242eb86bb1c6b301
Component: packaging
This commit is contained in:
Andrew Hsu
2018-09-05 15:45:18 -07:00
committed by GitHub

View File

@ -1,6 +1,6 @@
# Common things for containerd functionality
CONTAINERD_PROXY_COMMIT=afca176732d9416fac1e79fd76ce45afe4cbc41f
CONTAINERD_PROXY_COMMIT=9a227f7e8a35ed802617a67d77b1e6aa3b767474
CONTAINERD_SHIM_PROCESS_IMAGE=docker.io/docker/containerd-shim-process:ff98a47
# If containerd is running use that socket instead