chore(ci): try fix boxes-test (#11162)

try to settle image clashes with a tag bump --------- Co-authored-by: ludamad <[email protected]>
AztecProtocol · Jan 10, 2025 · a66349f · a66349f
1 parent f4e5c79
commit a66349f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Dockerfile.boxes b/Dockerfile.boxes
@@ -1,4 +1,4 @@
-FROM aztecprotocol/ci:2.0
+FROM aztecprotocol/ci:2.1
 COPY /usr/src /usr/src
 WORKDIR /usr/src/boxes
 RUN ls /usr/src/boxes

diff --git a/build-images/Earthfile b/build-images/Earthfile
@@ -234,8 +234,8 @@ ci:
   ENV CI=1
 
   ARG TARGETARCH
-  SAVE IMAGE --push aztecprotocol/ci:2.0-$TARGETARCH
-  SAVE IMAGE --push aztecprotocol/ci:2.0
+  SAVE IMAGE --push aztecprotocol/ci:2.1-$TARGETARCH
+  SAVE IMAGE --push aztecprotocol/ci:2.1
 
 ########################################################################################################################
 # We want to produce downstream images: devbox and sysbox. This image is the base image for each.
@@ -477,7 +477,7 @@ aztec-base:
   ARG TARGETARCH
   SAVE IMAGE --push aztecprotocol/aztec-base:v1.0-$TARGETARCH
 
-# Add a new target for end-to-end-base that corresponds to the portion of Dockerfile.end-to-end before COPY /usr/src
+# Add a new target for end-to-end-base that corresponds to the portion of Dockerfile.end-to-end before COPY /usr/src.
 end-to-end-base:
   FROM ubuntu:noble
   # Add our dev testing dependencies.

diff --git a/ci3/aws/ami_update.sh b/ci3/aws/ami_update.sh
@@ -36,9 +36,9 @@ scp -F build_instance_ssh_config $HOME/.aws/build_instance_credentials ubuntu@$i
 # Download crs onto machine.
 ssh -t -F build_instance_ssh_config ubuntu@$ip < ../../barretenberg/scripts/download_bb_crs.sh
 
-# Pull ci:2.0 onto host, and build:2.0 into docker-in-docker volume.
+# Pull ci:2.1 onto host, and build:2.0 into docker-in-docker volume.
 ssh -t -F build_instance_ssh_config ubuntu@$ip '
-  docker run --privileged -ti --rm -v boostrap_ci_local_docker:/var/lib/docker aztecprotocol/ci:2.0 bash -c "
+  docker run --privileged -ti --rm -v boostrap_ci_local_docker:/var/lib/docker aztecprotocol/ci:2.1 bash -c "
     /usr/local/share/docker-init.sh &> /dev/null
     sleep 5
     docker pull aztecprotocol/build:2.0

diff --git a/ci3/bootstrap_ec2 b/ci3/bootstrap_ec2
@@ -66,7 +66,7 @@ ssh -t -F $ci3/aws/build_instance_ssh_config ubuntu@$ip "
     -v boostrap_ci_local_docker:/var/lib/docker \
     -v \$HOME:/root \
     -v /tmp:/tmp \
-    aztecprotocol/ci:2.0 bash -c '
+    aztecprotocol/ci:2.1 bash -c '
       [ -n \"$GITHUB_LOG\" ] && echo "::endgroup::"
       [ -n \"$GITHUB_LOG\" ] && echo "::group::Clone Repository"
       set -e

diff --git a/ci3/bootstrap_local b/ci3/bootstrap_local
@@ -21,7 +21,7 @@ docker run --name aztec_build -ti --rm \
   -v $root:/aztec-packages-host:ro \
   -v $HOME/.aws:/root/.aws:ro \
   -v $HOME/.bb-crs:/root/.bb-crs:ro \
-  aztecprotocol/ci:2.0 bash -c "
+  aztecprotocol/ci:2.1 bash -c "
   set -e
   /usr/local/share/docker-init.sh &> /dev/null
   git config --global --add safe.directory /aztec-packages-host/.git

diff --git a/ci3/bootstrap_local_noninteractive b/ci3/bootstrap_local_noninteractive
@@ -17,7 +17,7 @@ docker run --rm \
   -v bootstrap_ci_local_docker:/var/lib/docker \
   -v $root:/aztec-packages-host:ro \
   -v $HOME/.aws:/root/.aws \
-  aztecprotocol/ci:2.0 bash -c "
+  aztecprotocol/ci:2.1 bash -c "
   /usr/local/share/docker-init.sh &> /dev/null
   git config --global --add safe.directory /aztec-packages-host/.git
   mkdir -p /root/aztec-packages && cd /root/aztec-packages