From 3d652d54d29c328f61bcd1f00fc61e94314e3189 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Wed, 10 Jul 2024 10:31:23 +0200 Subject: [PATCH] Check `arch` for podman build Usually going with Darwin -> aarch64 and the rest fallback to amd64 isn't a bad choice, but I think we can do better by checking `arch` so a device like a Raspberry which has an ARM CPU is able to run the build script. --- radicle-httpd/build/build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/radicle-httpd/build/build b/radicle-httpd/build/build index b0ce50c40..c2e471e9f 100755 --- a/radicle-httpd/build/build +++ b/radicle-httpd/build/build @@ -10,6 +10,8 @@ main() { export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) # Define user OS for podman export OS=$(uname) + # Define architecture for podman + export ARCH=$(arch) if ! command -v rad >/dev/null; then echo "fatal: rad is not installed" >&2 @@ -54,7 +56,7 @@ main() { --build-arg LC_ALL \ --build-arg RADICLE_VERSION=$version \ --build-arg GIT_HEAD=$rev \ - --arch aarch64 --tag $image -f ./build/Dockerfile - <$gitarchive + --arch $ARCH --tag $image -f ./build/Dockerfile - <$gitarchive echo "Creating container (radicle-build-container).." podman create --ulimit=host --replace --name radicle-build-container $image @@ -65,7 +67,7 @@ main() { --build-arg TZ \ --build-arg LC_ALL \ --build-arg RADICLE_VERSION=$version \ - --arch amd64 --tag $image -f ./build/Dockerfile - <$gitarchive + --arch $ARCH --tag $image -f ./build/Dockerfile - <$gitarchive echo "Creating container (radicle-build-container).." podman --cgroup-manager=cgroupfs create --ulimit=host --replace --name radicle-build-container $image