hack: Remove the need to build wireServer.imageList

the images.all derivation builds a nice link farm which can be used instead.

Author: akshaymankar

Makefile

@@ -319,8 +319,11 @@ upload-images:
 upload-images-dev:
 	./hack/bin/upload-images.sh imagesUnoptimizedNoDocs
 
+HOOGLE_IMAGE_DIR := $(shell mktemp -d -t wire-server-hoogle-image.XXXXXX)
+
 upload-hoogle-image:
-	./hack/bin/upload-image.sh wireServer.hoogleImage
+  nix -v --show-trace -L build ".#wireServer.hoogleImage" --out-link=$(HOOGLE_IMAGE_DIR)/image --fallback
+	./hack/bin/upload-image.sh $(HOOGLE_IMAGE_DIR)/image
 
 #################################
 ## cassandra / postgres management

hack/bin/upload-image.sh

@@ -14,12 +14,8 @@ set -euo pipefail
 
 readonly DOCKER_TAG=${DOCKER_TAG:?"Please set the DOCKER_TAG env variable"}
 
-readonly usage="USAGE: $0 <image_attr>"
-readonly IMAGE_ATTR=${1:?$usage}
-
-SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
-ROOT_DIR=$(cd -- "$SCRIPT_DIR/../../" &>/dev/null && pwd)
-readonly SCRIPT_DIR ROOT_DIR
+readonly usage="USAGE: $0 <image_stream_file>"
+readonly IMAGE_STREAM_FILE=${1:?$usage}
 
 credsArgs=""
 if [[ "${DOCKER_USER+x}" != "" ]]; then
@@ -63,10 +59,8 @@ tmp_link_store=$(mktemp -d)
 # product of other store paths which should already be cached and a lot of our
 # images should have a few common layers. More information:
 # https://nixos.org/manual/nixpkgs/unstable/#ssec-pkgs-dockerTools-streamLayeredImage
-image_stream_file="$tmp_link_store/image_stream"
-nix -v --show-trace -L build "$ROOT_DIR#$IMAGE_ATTR" -o "$image_stream_file"
 image_file="$tmp_link_store/image"
-"$image_stream_file" >"$image_file"
+"$IMAGE_STREAM_FILE" >"$image_file"
 repo=$(skopeo list-tags "docker-archive://$image_file" | jq -r '.Tags[0] | split(":") | .[0]')
 printf "*** Uploading $image_file to %s:%s\n" "$repo" "$DOCKER_TAG"
 # shellcheck disable=SC2086

hack/bin/upload-images.sh

@@ -20,14 +20,13 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 ROOT_DIR=$(cd -- "$SCRIPT_DIR/../../" &>/dev/null && pwd)
 readonly SCRIPT_DIR ROOT_DIR
 
-tmp_link_store=$(mktemp -d)
-image_list_file="$tmp_link_store/image-list"
-nix -v --show-trace -L build "$ROOT_DIR#wireServer.imagesList" -o "$image_list_file" --fallback
-
 # Build everything first so we can benefit the most from having many cores.
-nix -v --show-trace -L build "$ROOT_DIR#wireServer.$IMAGES_ATTR.all" --no-link --fallback
+result=$(mktemp -d -t stream-images.XXXXXX)
+nix -v --show-trace -L build "$ROOT_DIR#wireServer.$IMAGES_ATTR.all" --out-link="$result" --fallback
 
-xargs -I {} -P 10 "$SCRIPT_DIR/upload-image.sh" "wireServer.$IMAGES_ATTR.{}" < "$image_list_file"
+find "$result/" -print0 | xargs -0 -I {} -P 10 "$SCRIPT_DIR/upload-image.sh" {}
 
 printf '*** Uploading image %s\n' nginz
-"$SCRIPT_DIR/upload-image.sh" nginz
+nginz_image=$(mktemp -d -t stream-nginz-image.XXXXXX)
+nix -v --show-trace -L build "$ROOT_DIR#wireServer.nginz" --out-link="$nginz_image/image" --fallback
+"$SCRIPT_DIR/upload-image.sh" "$nginz_image/image"