From b5dc4c66172afbc8d5698ac940a077d9fdc71d7b Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Tue, 31 Jan 2023 11:46:31 +0100
Subject: [PATCH] cirrus: Polish container_image_manifest_docker_builder

---
 .cirrus.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index d9133d8f11..2fc1f21559 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -491,15 +491,16 @@ container_image_manifest_docker_builder:
       env
       exit 1
     fi
-  build_script:
+  load_image_script:
     # Fetch and load the images from the previous tasks
-    - set -x; curl -v -O http://$CIRRUS_HTTP_CACHE_HOST/${CIRRUS_BUILD_ID}-image-arm64
-    - set -x; curl -v -O http://$CIRRUS_HTTP_CACHE_HOST/${CIRRUS_BUILD_ID}-image-amd64
-    - set -x; zstd -d < ${CIRRUS_BUILD_ID}-image-arm64 | docker load
-    - set -x; zstd -d < ${CIRRUS_BUILD_ID}-image-amd64 | docker load
-
+    - set -x;
+    - curl -sSf -O http://$CIRRUS_HTTP_CACHE_HOST/${CIRRUS_BUILD_ID}-image-arm64
+    - curl -sSf -O http://$CIRRUS_HTTP_CACHE_HOST/${CIRRUS_BUILD_ID}-image-amd64
+    - zstd -d < ${CIRRUS_BUILD_ID}-image-arm64 | docker load
+    - zstd -d < ${CIRRUS_BUILD_ID}-image-amd64 | docker load
+  tag_push_script:
+    # Tag images and push to Docker Hub and AWS ECR
     - ./ci/container-images-tag-and-push.sh
-
     - REGISTRY_PREFIX=public.ecr.aws/ ./ci/container-images-tag-and-push.sh
   depends_on:
     - arm64_container_image