Fix Circle CI images being rebuilt on each step (#2276)

(cherry picked from commit 3c440db)

Author: RobertLucian

.circleci/config.yml

@@ -117,7 +117,6 @@ jobs:
       - image: cimg/python:3.6
     environment:
       DOCKER_CLI_EXPERIMENTAL: enabled
-      DOCKER_CONTEXT: default
     steps:
       - setup_remote_docker
       - checkout
@@ -131,16 +130,13 @@ jobs:
       - run: make ci-build-cli
       - return-if-not-deployed-branch
       - run: make ci-build-and-upload-cli
-      - run:
-          command: make ci-build-images
-          no_output_timeout: 40m
       - quay-login
       - run:
-          command: make ci-push-images
-          no_output_timeout: 20m
-      - run:
-          command: make ci-backup-images
-          no_output_timeout: 20m
+          name: Build and Push CI Images
+          command: |
+            make ci-build-images
+            make ci-push-images
+          no_output_timeout: 40m
 
   e2e-tests:
     docker:

Makefile

@@ -204,10 +204,7 @@ ci-build-images:
 	@./build/build-images.sh
 
 ci-push-images:
-	@./build/push-images.sh quay.io
-
-ci-backup-images:
-	@./build/push-images.sh docker.io
+	@./build/push-images.sh quay.io docker.io
 
 ci-build-cli:
 	@./build/cli.sh

build/push-image.sh

@@ -21,9 +21,10 @@ ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null && pwd)"
 
 CORTEX_VERSION=0.37.0
 
-host=$1
-image=$2
-platforms=$3
+host_primary=$1
+host_backup=$2
+image=$3
+platforms=$4
 
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-docker buildx build $ROOT --progress plain -f $ROOT/images/$image/Dockerfile -t $host/cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms --push
+docker buildx build $ROOT --progress plain -f $ROOT/images/$image/Dockerfile -t $host_primary/cortexlabs/${image}:${CORTEX_VERSION} -t $host_backup/cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms --push

build/push-images.sh

@@ -22,12 +22,13 @@ ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null && pwd)"
 source $ROOT/build/images.sh
 source $ROOT/dev/util.sh
 
-host=$1
+host_primary=$1
+host_backup=$2
 
 for image in "${all_images[@]}"; do
   platforms="linux/amd64"
   if in_array $image "multi_arch_images"; then
     platforms+=",linux/arm64"
   fi
-  $ROOT/build/push-image.sh $host $image $platforms
+  $ROOT/build/push-image.sh $host_primary $host_backup $image $platforms
 done