From 0893516dd74e70b24de5b2030ad196e047ca139a Mon Sep 17 00:00:00 2001
From: marun <maru.newby@avalabs.org>
Date: Mon, 3 Jun 2024 18:06:53 +0200
Subject: [PATCH] [antithesis] Skip push for builder image (#3070)

---
 scripts/build_antithesis_images.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/scripts/build_antithesis_images.sh b/scripts/build_antithesis_images.sh
index 964b966cf177..958f80a250b9 100755
--- a/scripts/build_antithesis_images.sh
+++ b/scripts/build_antithesis_images.sh
@@ -74,6 +74,18 @@ function build_images {
     docker_cmd="${docker_cmd} --build-arg AVALANCHEGO_NODE_IMAGE=antithesis-avalanchego-node:${TAG}"
   fi
 
+  if [[ "${test_setup}" == "avalanchego" ]]; then
+    # Build the image that enables compiling golang binaries for the node and workload
+    # image builds. The builder image is intended to enable building instrumented binaries
+    # if built on amd64 and non-instrumented binaries if built on arm64.
+    #
+    # The builder image is not intended to be pushed so it needs to be built in advance of
+    # adding `--push` to docker_cmd. Since it is never prefixed with `[registry]/[repo]`,
+    # attempting to push will result in an error like `unauthorized: access token has
+    # insufficient scopes`.
+    ${docker_cmd} -t "${builder_image_name}" -f "${builder_dockerfile}" "${AVALANCHE_PATH}"
+  fi
+
   if [[ -n "${image_prefix}" && -z "${node_only}" ]]; then
     # Push images with an image prefix since the prefix defines a
     # registry location, and only if building all images. When
@@ -82,13 +94,6 @@ function build_images {
     docker_cmd="${docker_cmd} --push"
   fi
 
-  if [[ "${test_setup}" == "avalanchego" ]]; then
-    # Build the image that enables compiling golang binaries for the node and workload
-    # image builds. The builder image is intended to enable building instrumented binaries
-    # if built on amd64 and non-instrumented binaries if built on arm64.
-    ${docker_cmd} -t "${builder_image_name}" -f "${builder_dockerfile}" "${AVALANCHE_PATH}"
-  fi
-
   # Build node image first to allow the workload image to use it.
   ${docker_cmd} -t "${node_image_name}" -f "${node_dockerfile}" "${AVALANCHE_PATH}"