From e183e2a880617c238076ef7c08e3261d8cfe3741 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 22 Jan 2023 22:19:23 -0700 Subject: [PATCH 1/2] Build foundry container locally Former-commit-id: f3f40339379a91aaba5f9b3b46618a61a8414af2 --- app/data/container-build/cerc-go-ethereum-foundry/Dockerfile | 4 +++- app/data/container-build/foundry-rs-foundry/build.sh | 4 ++++ app/data/container-image-list.txt | 1 + app/data/repository-list.txt | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100755 app/data/container-build/foundry-rs-foundry/build.sh diff --git a/app/data/container-build/cerc-go-ethereum-foundry/Dockerfile b/app/data/container-build/cerc-go-ethereum-foundry/Dockerfile index bbbc64fc..38a3ca29 100644 --- a/app/data/container-build/cerc-go-ethereum-foundry/Dockerfile +++ b/app/data/container-build/cerc-go-ethereum-foundry/Dockerfile @@ -1,4 +1,6 @@ -FROM ghcr.io/foundry-rs/foundry +# Use locally build foundry base image to work around there being +# no aarm64 image published. +FROM foundry-rs/foundry:local RUN apk update ; apk add --no-cache --allow-untrusted ca-certificates curl bash git jq RUN apk add --no-cache --upgrade grep diff --git a/app/data/container-build/foundry-rs-foundry/build.sh b/app/data/container-build/foundry-rs-foundry/build.sh new file mode 100755 index 00000000..08332892 --- /dev/null +++ b/app/data/container-build/foundry-rs-foundry/build.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# Build foundry-rs/foundry +# HACK below : TARGETARCH needs to be derived from the host environment +docker build -t foundry-rs/foundry:local --build-arg TARGETARCH=arm64 ${CERC_REPO_BASE_DIR}/foundry diff --git a/app/data/container-image-list.txt b/app/data/container-image-list.txt index 48d5bc04..309b6058 100644 --- a/app/data/container-image-list.txt +++ b/app/data/container-image-list.txt @@ -1,3 +1,4 @@ +foundry-rs/foundry cerc/test-contract cerc/eth-statediff-fill-service cerc/eth-statediff-service diff --git a/app/data/repository-list.txt b/app/data/repository-list.txt index 43507d6e..35f47c07 100644 --- a/app/data/repository-list.txt +++ b/app/data/repository-list.txt @@ -16,3 +16,4 @@ vulcanize/uniswap-v3-info vulcanize/assemblyscript cerc-io/eth-probe cerc-io/tx-spammer +foundry-rs/foundry From c6c9e229d2615aa650b768b6b9447fc11effb4d2 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Mon, 23 Jan 2023 17:07:23 -0700 Subject: [PATCH 2/2] Revert debugging code Former-commit-id: 14e57abfbfa2d137f910d46080569773ebfa8456 --- app/data/container-build/foundry-rs-foundry/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/data/container-build/foundry-rs-foundry/build.sh b/app/data/container-build/foundry-rs-foundry/build.sh index 08332892..7bfbf873 100755 --- a/app/data/container-build/foundry-rs-foundry/build.sh +++ b/app/data/container-build/foundry-rs-foundry/build.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash # Build foundry-rs/foundry # HACK below : TARGETARCH needs to be derived from the host environment -docker build -t foundry-rs/foundry:local --build-arg TARGETARCH=arm64 ${CERC_REPO_BASE_DIR}/foundry +docker build -t foundry-rs/foundry:local ${CERC_REPO_BASE_DIR}/foundry