From 8e9bdfa4a051e3ddff3b1168bd0a28cf463681b2 Mon Sep 17 00:00:00 2001 From: Carlton N Hanna Date: Wed, 18 Oct 2023 09:04:27 -0600 Subject: [PATCH] add a fix and temp publish docker from branch --- .github/workflows/docker.yml | 1 + docker/blockchain/Dockerfile | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cae8de7780..e367f91cbd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,6 +5,7 @@ on: push: branches: - main + - nullpointer0x00/1634-arm64-container-builds tags: - "v[0-9]+.[0-9]+.[0-9]+" # Push events to matching v*, i.e. v1.0, v20.15.10 - "v[0-9]+.[0-9]+.[0-9]+-rc*" # Push events to matching v*, i.e. v1.0-rc1, v20.15.10-rc5 diff --git a/docker/blockchain/Dockerfile b/docker/blockchain/Dockerfile index 6fa632a18d..a70f53c09a 100644 --- a/docker/blockchain/Dockerfile +++ b/docker/blockchain/Dockerfile @@ -22,8 +22,11 @@ COPY Makefile sims.mk ./ # Build and install provenanced -ENV VERSION=$VERSION -RUN make VERSION=${VERSION} WITH_CLEVELDB=true install +ENV VERSION=${VERSION} +RUN UNAME_M=$(uname -m) && \ + echo "UNAME_M: ${UNAME_M}" && \ + if [ ${UNAME_M} != "x86_64" ]; then export ARCH=aarch64; fi && \ + make VERSION=${VERSION} WITH_CLEVELDB=true install ### FROM debian:bullseye-slim as run