summaryrefslogtreecommitdiff
path: root/hack/make/binary-daemon
diff options
context:
space:
mode:
authorTibor Vass <tibor@docker.com>2018-09-25 16:56:40 +0000
committerTibor Vass <tibor@docker.com>2018-09-25 16:58:28 +0000
commit361412c79eeacf11b07871870e875f9e5bce3ea7 (patch)
treeb8485a0f0ebdeb3b6a12f7aa31dfe3731c1fd68f /hack/make/binary-daemon
parent34eede0296bce6a9c335cb429f10728ae3f4252d (diff)
downloaddocker-361412c79eeacf11b07871870e875f9e5bce3ea7.tar.gz
hack/make: remove 'docker-' prefix when copying binaries
Signed-off-by: Tibor Vass <tibor@docker.com>
Diffstat (limited to 'hack/make/binary-daemon')
-rw-r--r--hack/make/binary-daemon8
1 files changed, 4 insertions, 4 deletions
diff --git a/hack/make/binary-daemon b/hack/make/binary-daemon
index f68163636b..c1a6e6f9ed 100644
--- a/hack/make/binary-daemon
+++ b/hack/make/binary-daemon
@@ -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
}