mirror of
https://github.com/logos-blockchain/logos-blockchain-testing.git
synced 2026-01-04 06:13:09 +00:00
Pass circuits platform through compose builds and Dockerfile
This commit is contained in:
parent
874a4531c9
commit
e0d63f3671
@ -306,7 +306,8 @@ if [ "$MODE" != "host" ]; then
|
|||||||
echo "==> Skipping testnet image rebuild (NOMOS_SKIP_IMAGE_BUILD=1)"
|
echo "==> Skipping testnet image rebuild (NOMOS_SKIP_IMAGE_BUILD=1)"
|
||||||
else
|
else
|
||||||
echo "==> Rebuilding testnet image (${IMAGE})"
|
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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@ -5,6 +5,7 @@
|
|||||||
ARG VERSION=v0.3.1
|
ARG VERSION=v0.3.1
|
||||||
ARG CIRCUITS_OVERRIDE
|
ARG CIRCUITS_OVERRIDE
|
||||||
ARG NOMOS_NODE_REV=d2dd5a5084e1daef4032562c77d41de5e4d495f8
|
ARG NOMOS_NODE_REV=d2dd5a5084e1daef4032562c77d41de5e4d495f8
|
||||||
|
ARG CIRCUITS_PLATFORM=linux-x86_64
|
||||||
|
|
||||||
# ===========================
|
# ===========================
|
||||||
# BUILD IMAGE
|
# BUILD IMAGE
|
||||||
@ -15,6 +16,7 @@ FROM rust:1.91.0-slim-bookworm AS builder
|
|||||||
ARG VERSION
|
ARG VERSION
|
||||||
ARG CIRCUITS_OVERRIDE
|
ARG CIRCUITS_OVERRIDE
|
||||||
ARG NOMOS_NODE_REV
|
ARG NOMOS_NODE_REV
|
||||||
|
ARG CIRCUITS_PLATFORM
|
||||||
|
|
||||||
LABEL maintainer="augustinas@status.im" \
|
LABEL maintainer="augustinas@status.im" \
|
||||||
source="https://github.com/logos-co/nomos-node" \
|
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 \
|
if [ ! -f "/opt/circuits/pol/verification_key.json" ]; then \
|
||||||
echo "Local circuits missing pol artifacts; downloading ${VERSION} bundle and rebuilding"; \
|
echo "Local circuits missing pol artifacts; downloading ${VERSION} bundle and rebuilding"; \
|
||||||
chmod +x scripts/setup-nomos-circuits.sh && \
|
chmod +x scripts/setup-nomos-circuits.sh && \
|
||||||
|
NOMOS_CIRCUITS_PLATFORM="${CIRCUITS_PLATFORM}" \
|
||||||
NOMOS_CIRCUITS_REBUILD_RAPIDSNARK=1 \
|
NOMOS_CIRCUITS_REBUILD_RAPIDSNARK=1 \
|
||||||
RAPIDSNARK_BUILD_GMP=1 \
|
RAPIDSNARK_BUILD_GMP=1 \
|
||||||
scripts/setup-nomos-circuits.sh "$VERSION" "/opt/circuits"; \
|
scripts/setup-nomos-circuits.sh "$VERSION" "/opt/circuits"; \
|
||||||
|
|||||||
@ -19,17 +19,27 @@ IMAGE_TAG="${IMAGE_TAG:-nomos-testnet:local}"
|
|||||||
VERSION="${VERSION:-v0.3.1}"
|
VERSION="${VERSION:-v0.3.1}"
|
||||||
KZG_DIR_REL="${NOMOS_KZG_DIR_REL:-testing-framework/assets/stack/kzgrs_test_params}"
|
KZG_DIR_REL="${NOMOS_KZG_DIR_REL:-testing-framework/assets/stack/kzgrs_test_params}"
|
||||||
CIRCUITS_OVERRIDE="${CIRCUITS_OVERRIDE:-${KZG_DIR_REL}}"
|
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}"
|
NOMOS_NODE_REV="${NOMOS_NODE_REV:-d2dd5a5084e1daef4032562c77d41de5e4d495f8}"
|
||||||
|
|
||||||
echo "Workspace root: ${ROOT_DIR}"
|
echo "Workspace root: ${ROOT_DIR}"
|
||||||
echo "Image tag: ${IMAGE_TAG}"
|
echo "Image tag: ${IMAGE_TAG}"
|
||||||
echo "Circuits override: ${CIRCUITS_OVERRIDE:-<none>}"
|
echo "Circuits override: ${CIRCUITS_OVERRIDE:-<none>}"
|
||||||
echo "Circuits version (fallback download): ${VERSION}"
|
echo "Circuits version (fallback download): ${VERSION}"
|
||||||
|
echo "Circuits platform: ${CIRCUITS_PLATFORM}"
|
||||||
|
|
||||||
build_args=(
|
build_args=(
|
||||||
-f "${DOCKERFILE_PATH}"
|
-f "${DOCKERFILE_PATH}"
|
||||||
-t "${IMAGE_TAG}"
|
-t "${IMAGE_TAG}"
|
||||||
--build-arg "NOMOS_NODE_REV=${NOMOS_NODE_REV}"
|
--build-arg "NOMOS_NODE_REV=${NOMOS_NODE_REV}"
|
||||||
|
--build-arg "CIRCUITS_PLATFORM=${CIRCUITS_PLATFORM}"
|
||||||
"${ROOT_DIR}"
|
"${ROOT_DIR}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user