diff --git a/hack/make/.binary b/hack/make/.binary index 4c5b2f3735..20bedb9a77 100644 --- a/hack/make/.binary +++ b/hack/make/.binary @@ -13,27 +13,6 @@ BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION" source "${MAKEDIR}/.go-autogen" -hash_files() { - while [ $# -gt 0 ]; do - f="$1" - shift - dir="$(dirname "$f")" - base="$(basename "$f")" - for hashAlgo in md5 sha256; do - if command -v "${hashAlgo}sum" &> /dev/null; then - ( - # subshell and cd so that we get output files like: - # $HASH docker-$VERSION - # instead of: - # $HASH /go/src/github.com/.../$VERSION/binary/docker-$VERSION - cd "$dir" - "${hashAlgo}sum" "$base" > "$base.$hashAlgo" - ) - fi - done - done -} - ( export GOGC=${DOCKER_BUILD_GOGC:-1000} @@ -115,4 +94,3 @@ hash_files() { ) echo "Created binary: $DEST/$BINARY_FULLNAME" -hash_files "$DEST/$BINARY_FULLNAME" diff --git a/hack/make/binary-daemon b/hack/make/binary-daemon index 1a702a549a..50ba154f91 100644 --- a/hack/make/binary-daemon +++ b/hack/make/binary-daemon @@ -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" )