Merge pull request #21941 from crosbymichael/copy-bins

Improve source for containerd/runc copy
Upstream-commit: 2bcb6d694f9c8a7d4ce1b2b2a5d8a32ae5ea6085
Component: engine

components/engine/hack/make.sh

@@ -319,7 +319,7 @@ copy_containerd() {
 		if [ -x /usr/local/bin/docker-runc ]; then
 			echo "Copying nested executables into $dir"
 			for file in containerd containerd-shim containerd-ctr runc; do
-				cp "/usr/local/bin/docker-$file" "$dir/"
+				cp `which "docker-$file"` "$dir/"
 				if [ "$2" == "hash" ]; then
 					hash_files "$dir/docker-$file"
 				fi