@@ -19,15 +19,29 @@ for d in "$CROSS/"*/*; do

 	mkdir -p "$DEST/$GOOS/$GOARCH"

 	TGZ="$DEST/$GOOS/$GOARCH/$BINARY_NAME.tgz"

-	mkdir -p "$DEST/build/usr/local/bin"

-	cp -L "$d/$BINARY_FULLNAME" "$DEST/build/usr/local/bin/docker$BINARY_EXTENSION"

-	copy_containerd "$DEST/build/usr/local/bin/"

+	# The staging directory for the files in the tgz

+	BUILD_PATH="$DEST/build"

-	tar --numeric-owner --owner 0 -C "$DEST/build" -czf "$TGZ" usr

+	# The directory that is at the root of the tar file

+	TAR_BASE_DIRECTORY="docker"

+

+	# $DEST/build/docker

+	TAR_PATH="$BUILD_PATH/$TAR_BASE_DIRECTORY"

+

+	# Copy the correct docker binary

+	mkdir -p $TAR_PATH

+	cp -L "$d/$BINARY_FULLNAME" "$TAR_PATH/docker$BINARY_EXTENSION"

+

+	# copy over all the containerd binaries

+	copy_containerd $TAR_PATH

+

+	echo "Creating tgz from $BUILD_PATH and naming it $TGZ"

+	tar --numeric-owner --owner 0 -C "$BUILD_PATH" -czf "$TGZ" $TAR_BASE_DIRECTORY

 	hash_files "$TGZ"

-	rm -rf "$DEST/build"

+	# cleanup after ourselves

+	rm -rf "$BUILD_PATH"

 	echo "Created tgz: $TGZ"

 done