update base image to arm-friendly one

Author: Thegaram

contracts/docker/Dockerfile.deploy

@@ -1,8 +1,24 @@
-FROM ghcr.io/foundry-rs/foundry:nightly-19d69f277de96f621d930cdb767a9693c55ae8e1 as foundry
+# Use the latest node Debian slim base image
+# This makes installing yarn dep much easier
+FROM node:20-bookworm-slim
 
-RUN apk add --no-cache bash jq
+# Switch to bash shell
+SHELL ["/bin/bash", "-c"]
 
-WORKDIR /contracts
+WORKDIR /root
+
+# Install dependencies
+RUN apt update
+RUN apt install --yes curl bash coreutils git jq
+
+# Download and run the Foundry installation script
+RUN curl -L https://foundry.paradigm.xyz | bash
+
+# Set the environment variables to ensure Foundry tools are in the PATH
+ENV PATH="/root/.foundry/bin:${PATH}"
+
+# Run foundryup to update Foundry
+RUN foundryup -v nightly-88011569efcebc9152267be217c8cfbedc32c07c
 
 # copy dependencies
 COPY ./lib /contracts/lib
@@ -20,6 +36,7 @@ COPY ./scripts /contracts/scripts
 ENV FOUNDRY_EVM_VERSION="cancun"
 ENV FOUNDRY_BYTECODE_HASH="none"
 
+WORKDIR /contracts
 RUN forge build
 
 # copy script configs

contracts/docker/Dockerfile.gen-configs

@@ -1,8 +1,24 @@
-FROM ghcr.io/foundry-rs/foundry:nightly-19d69f277de96f621d930cdb767a9693c55ae8e1 as foundry
+# Use the latest node Debian slim base image
+# This makes installing yarn dep much easier
+FROM node:20-bookworm-slim
 
-RUN apk add --no-cache bash jq
+# Switch to bash shell
+SHELL ["/bin/bash", "-c"]
 
-WORKDIR /contracts
+WORKDIR /root
+
+# Install dependencies
+RUN apt update
+RUN apt install --yes curl bash coreutils git jq
+
+# Download and run the Foundry installation script
+RUN curl -L https://foundry.paradigm.xyz | bash
+
+# Set the environment variables to ensure Foundry tools are in the PATH
+ENV PATH="/root/.foundry/bin:${PATH}"
+
+# Run foundryup to update Foundry
+RUN foundryup -v nightly-88011569efcebc9152267be217c8cfbedc32c07c
 
 # copy dependencies
 COPY ./lib /contracts/lib
@@ -20,6 +36,7 @@ COPY ./scripts /contracts/scripts
 ENV FOUNDRY_EVM_VERSION="cancun"
 ENV FOUNDRY_BYTECODE_HASH="none"
 
+WORKDIR /contracts
 RUN forge build
 
 # copy script configs

contracts/docker/scripts/build.sh

@@ -5,6 +5,22 @@ tag=${latest_commit:0:8}
 echo "Using Docker image tag: $tag"
 echo ""
 
-docker build -f docker/Dockerfile.gen-configs -t scrolltech/scroll-stack-contracts:gen-configs-$tag --platform linux/amd64 .
+docker build -f docker/Dockerfile.gen-configs -t scrolltech/scroll-stack-contracts:gen-configs-$tag-amd64 --platform linux/amd64 .
+echo
+echo "built scrolltech/scroll-stack-contracts:gen-configs-$tag-amd64"
+echo
 
-docker build -f docker/Dockerfile.deploy -t scrolltech/scroll-stack-contracts:deploy-$tag --platform linux/amd64 .
+docker build -f docker/Dockerfile.gen-configs -t scrolltech/scroll-stack-contracts:gen-configs-$tag-arm64 --platform linux/arm64 .
+echo
+echo "built scrolltech/scroll-stack-contracts:gen-configs-$tag-arm64"
+echo
+
+docker build -f docker/Dockerfile.deploy -t scrolltech/scroll-stack-contracts:deploy-$tag-amd64 --platform linux/amd64 .
+echo
+echo "built scrolltech/scroll-stack-contracts:deploy-$tag-amd64"
+echo
+
+docker build -f docker/Dockerfile.deploy -t scrolltech/scroll-stack-contracts:deploy-$tag-arm64 --platform linux/arm64 .
+echo
+echo "built scrolltech/scroll-stack-contracts:deploy-$tag-arm64"
+echo

contracts/docker/scripts/push.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+latest_commit=$(git log -1 --pretty=format:%h)
+tag=${latest_commit:0:8}
+echo "Using Docker image tag: $tag"
+echo ""
+
+docker push scrolltech/scroll-stack-contracts:gen-configs-$tag-amd64
+docker push scrolltech/scroll-stack-contracts:gen-configs-$tag-arm64
+
+docker manifest create scrolltech/scroll-stack-contracts:gen-configs-$tag \
+    --amend scrolltech/scroll-stack-contracts:gen-configs-$tag-amd64 \
+    --amend scrolltech/scroll-stack-contracts:gen-configs-$tag-arm64
+
+docker manifest push scrolltech/scroll-stack-contracts:gen-configs-$tag
+
+docker push scrolltech/scroll-stack-contracts:deploy-$tag-amd64
+docker push scrolltech/scroll-stack-contracts:deploy-$tag-arm64
+
+docker manifest create scrolltech/scroll-stack-contracts:deploy-$tag \
+    --amend scrolltech/scroll-stack-contracts:deploy-$tag-amd64 \
+    --amend scrolltech/scroll-stack-contracts:deploy-$tag-arm64
+
+docker manifest push scrolltech/scroll-stack-contracts:deploy-$tag