From e0d63f3671e206621fc1498dc32c794fa1b2c60c Mon Sep 17 00:00:00 2001 From: andrussal Date: Tue, 9 Dec 2025 16:28:59 +0100 Subject: [PATCH] Pass circuits platform through compose builds and Dockerfile --- scripts/run-examples.sh | 3 ++- testing-framework/assets/stack/Dockerfile | 3 +++ .../assets/stack/scripts/build_test_image.sh | 10 ++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/scripts/run-examples.sh b/scripts/run-examples.sh index 40a87f1..f7dc8d3 100755 --- a/scripts/run-examples.sh +++ b/scripts/run-examples.sh @@ -306,7 +306,8 @@ if [ "$MODE" != "host" ]; then echo "==> Skipping testnet image rebuild (NOMOS_SKIP_IMAGE_BUILD=1)" else echo "==> Rebuilding testnet image (${IMAGE})" - IMAGE_TAG="${IMAGE}" "${ROOT_DIR}/testing-framework/assets/stack/scripts/build_test_image.sh" + IMAGE_TAG="${IMAGE}" COMPOSE_CIRCUITS_PLATFORM="${COMPOSE_CIRCUITS_PLATFORM:-}" \ + "${ROOT_DIR}/testing-framework/assets/stack/scripts/build_test_image.sh" fi fi diff --git a/testing-framework/assets/stack/Dockerfile b/testing-framework/assets/stack/Dockerfile index ab31aa6..2ae752e 100644 --- a/testing-framework/assets/stack/Dockerfile +++ b/testing-framework/assets/stack/Dockerfile @@ -5,6 +5,7 @@ ARG VERSION=v0.3.1 ARG CIRCUITS_OVERRIDE ARG NOMOS_NODE_REV=d2dd5a5084e1daef4032562c77d41de5e4d495f8 +ARG CIRCUITS_PLATFORM=linux-x86_64 # =========================== # BUILD IMAGE @@ -15,6 +16,7 @@ FROM rust:1.91.0-slim-bookworm AS builder ARG VERSION ARG CIRCUITS_OVERRIDE ARG NOMOS_NODE_REV +ARG CIRCUITS_PLATFORM LABEL maintainer="augustinas@status.im" \ source="https://github.com/logos-co/nomos-node" \ @@ -71,6 +73,7 @@ RUN mkdir -p /opt/circuits && \ if [ ! -f "/opt/circuits/pol/verification_key.json" ]; then \ echo "Local circuits missing pol artifacts; downloading ${VERSION} bundle and rebuilding"; \ chmod +x scripts/setup-nomos-circuits.sh && \ + NOMOS_CIRCUITS_PLATFORM="${CIRCUITS_PLATFORM}" \ NOMOS_CIRCUITS_REBUILD_RAPIDSNARK=1 \ RAPIDSNARK_BUILD_GMP=1 \ scripts/setup-nomos-circuits.sh "$VERSION" "/opt/circuits"; \ diff --git a/testing-framework/assets/stack/scripts/build_test_image.sh b/testing-framework/assets/stack/scripts/build_test_image.sh index f13ec1e..3ef5690 100755 --- a/testing-framework/assets/stack/scripts/build_test_image.sh +++ b/testing-framework/assets/stack/scripts/build_test_image.sh @@ -19,17 +19,27 @@ IMAGE_TAG="${IMAGE_TAG:-nomos-testnet:local}" VERSION="${VERSION:-v0.3.1}" KZG_DIR_REL="${NOMOS_KZG_DIR_REL:-testing-framework/assets/stack/kzgrs_test_params}" CIRCUITS_OVERRIDE="${CIRCUITS_OVERRIDE:-${KZG_DIR_REL}}" +CIRCUITS_PLATFORM="${CIRCUITS_PLATFORM:-${COMPOSE_CIRCUITS_PLATFORM:-}}" +if [ -z "${CIRCUITS_PLATFORM}" ]; then + case "$(uname -m)" in + x86_64) CIRCUITS_PLATFORM="linux-x86_64" ;; + arm64|aarch64) CIRCUITS_PLATFORM="linux-aarch64" ;; + *) CIRCUITS_PLATFORM="linux-x86_64" ;; + esac +fi NOMOS_NODE_REV="${NOMOS_NODE_REV:-d2dd5a5084e1daef4032562c77d41de5e4d495f8}" echo "Workspace root: ${ROOT_DIR}" echo "Image tag: ${IMAGE_TAG}" echo "Circuits override: ${CIRCUITS_OVERRIDE:-}" echo "Circuits version (fallback download): ${VERSION}" +echo "Circuits platform: ${CIRCUITS_PLATFORM}" build_args=( -f "${DOCKERFILE_PATH}" -t "${IMAGE_TAG}" --build-arg "NOMOS_NODE_REV=${NOMOS_NODE_REV}" + --build-arg "CIRCUITS_PLATFORM=${CIRCUITS_PLATFORM}" "${ROOT_DIR}" )