|
@@ -3,7 +3,7 @@ set -e
|
|
|
|
|
|
copy_binaries() {
|
|
|
local dir="$1"
|
|
|
- local hash="$2"
|
|
|
+
|
|
|
# Add nested executables to bundle dir so we have complete set of
|
|
|
# them available, but only if the native OS/ARCH is the same as the
|
|
|
# OS/ARCH of the build target
|
|
@@ -16,17 +16,11 @@ copy_binaries() {
|
|
|
echo "Copying nested executables into $dir"
|
|
|
for file in containerd containerd-shim-runc-v2 ctr runc docker-init rootlesskit rootlesskit-docker-proxy dockerd-rootless.sh dockerd-rootless-setuptool.sh; do
|
|
|
cp -f "$(command -v "$file")" "$dir/"
|
|
|
- if [ "$hash" = "hash" ]; then
|
|
|
- hash_files "$dir/$file"
|
|
|
- fi
|
|
|
done
|
|
|
|
|
|
# vpnkit is available for x86_64 and aarch64
|
|
|
if command -v "vpnkit.$(uname -m)" 2>&1 > /dev/null; then
|
|
|
cp -f "$(command -v "vpnkit.$(uname -m)")" "$dir/vpnkit"
|
|
|
- if [ "$hash" = "hash" ]; then
|
|
|
- hash_files "$dir/vpnkit"
|
|
|
- fi
|
|
|
fi
|
|
|
}
|
|
|
|
|
@@ -37,5 +31,5 @@ copy_binaries() {
|
|
|
BINARY_NAME='dockerd'
|
|
|
|
|
|
source "${MAKEDIR}/.binary"
|
|
|
- copy_binaries "$DEST" 'hash'
|
|
|
+ copy_binaries "$DEST"
|
|
|
)
|