Use pushed build images.

AztecProtocol · May 2, 2024 · 0362754 · 0362754
1 parent 6cc924d
commit 0362754
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/build-images/Earthfile b/build-images/Earthfile
@@ -1,5 +1,4 @@
 VERSION 0.8
 
 build:
-  FROM DOCKERFILE --target build .
-  SAVE ARTIFACT /opt/foundry/bin/anvil
+  FROM aztecprotocol/build:1.0
diff --git a/build-images/Makefile b/build-images/Makefile
@@ -1,4 +1,6 @@
 ARCH := $(shell uname -m | sed 's/aarch64/arm64/')
+FOUNDRY_TAG := de33b6af53005037b463318d2628b5cfcaf39916
+VERSION := 1.0
 
 wasi-sdk:
 	docker build -t aztecprotocol/wasi-sdk:$(ARCH)-22.0 --target wasi-sdk --push .
@@ -7,7 +9,6 @@ wasi-sdk:
 		--amend aztecprotocol/wasi-sdk:arm64-22.0
 	docker manifest push aztecprotocol/wasi-sdk:22.0
 
-FOUNDRY_TAG := de33b6af53005037b463318d2628b5cfcaf39916
 foundry:
 	docker build -t aztecprotocol/foundry:$(ARCH)-$(FOUNDRY_TAG) --build-arg TAG=$(FOUNDRY_TAG) --target foundry --push .
 	docker manifest create aztecprotocol/foundry:$(FOUNDRY_TAG) \
@@ -24,9 +25,25 @@ osxcross:
 
 build:
 	docker build -t aztecprotocol/build --target build .
+	docker tag aztecprotocol/build aztecprotocol/build:$(ARCH)-$(VERSION)
+
+build-push: build
+	docker push aztecprotocol/build:$(ARCH)-$(VERSION)
+	docker manifest create aztecprotocol/build:$(VERSION) \
+		--amend aztecprotocol/build:x86_64-$(VERSION) \
+		--amend aztecprotocol/build:arm64-$(VERSION)
+	docker manifest push aztecprotocol/build:$(VERSION)
 
 devbox:
 	docker build -t aztecprotocol/devbox --target devbox .
+	docker tag aztecprotocol/devbox aztecprotocol/devbox:$(ARCH)-$(VERSION)
+
+devbox-push: devbox
+	docker push aztecprotocol/devbox:$(ARCH)-$(VERSION)
+	docker manifest create aztecprotocol/devbox:$(VERSION) \
+		--amend aztecprotocol/devbox:x86_64-$(VERSION) \
+		--amend aztecprotocol/devbox:arm64-$(VERSION)
+	docker manifest push aztecprotocol/devbox:$(VERSION)
 
 sysbox:
 	docker build -t aztecprotocol/sysbox --target sysbox .

diff --git a/yarn-project/end-to-end/Earthfile b/yarn-project/end-to-end/Earthfile
@@ -18,8 +18,6 @@ E2E_COMPOSE_TEST:
   WITH DOCKER \
     --load aztecprotocol/aztec:latest=../+aztec \
     --load aztecprotocol/end-to-end:latest=../+end-to-end \
-    --load aztecprotocol/foundry-nightly-de33b6af53005037b463318d2628b5cfcaf3991:latest=../../build-images+build
-    # Run our docker compose, ending whenever sandbox ends, filtering out noisy eth_getLogs
     RUN $CMD -p $project_name -f $compose_file up --exit-code-from=end-to-end --force-recreate
   END
 

diff --git a/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml b/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   fork:
-    image: aztecprotocol/foundry-nightly-de33b6af53005037b463318d2628b5cfcaf3991:latest
+    image: aztecprotocol/foundry:de33b6af53005037b463318d2628b5cfcaf3991
     entrypoint: >
       sh -c '
       if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then

diff --git a/yarn-project/end-to-end/scripts/docker-compose-p2p.yml b/yarn-project/end-to-end/scripts/docker-compose-p2p.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   fork:
-    image: aztecprotocol/foundry-nightly-de33b6af53005037b463318d2628b5cfcaf3991:latest
+    image: aztecprotocol/foundry:de33b6af53005037b463318d2628b5cfcaf3991
     entrypoint: 'anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337'
     expose:
       - '8545'

diff --git a/yarn-project/end-to-end/scripts/docker-compose.yml b/yarn-project/end-to-end/scripts/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   fork:
-    image: aztecprotocol/foundry-nightly-de33b6af53005037b463318d2628b5cfcaf3991:latest
+    image: aztecprotocol/foundry:de33b6af53005037b463318d2628b5cfcaf3991
     entrypoint: >
       sh -c '
       if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then