hack/make: remove 'docker-' prefix when copying binaries

Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Tibor Vass 2018-09-25 16:56:40 +00:00
parent 34eede0296
commit 361412c79e

View file

@ -10,14 +10,14 @@ copy_binaries() {
if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then
return
fi
if [ ! -x /usr/local/bin/docker-runc ]; then
if [ ! -x /usr/local/bin/runc ]; then
return
fi
echo "Copying nested executables into $dir"
for file in containerd containerd-shim containerd-ctr runc init proxy; do
cp -f `which "docker-$file"` "$dir/"
for file in containerd containerd-shim ctr runc docker-init docker-proxy; do
cp -f `which "$file"` "$dir/"
if [ "$hash" == "hash" ]; then
hash_files "$dir/docker-$file"
hash_files "$dir/$file"
fi
done
}