From 44e9e43c41506bdcc371daea42b31a3ae7fdcb33 Mon Sep 17 00:00:00 2001 From: Petr Bokoc Date: Aug 27 2021 03:33:22 +0000 Subject: Update build script for Aarch64 and local antora installs --- diff --git a/build.sh b/build.sh index f4ecfe4..75dd387 100755 --- a/build.sh +++ b/build.sh @@ -3,25 +3,30 @@ image="docker.io/antora/antora" cmd="--html-url-extension-style=indexify site.yml" -if [ "$(uname)" = "Darwin" ]; then +if [ "$(uname)" == "Darwin" ]; then # Running on macOS. # Let's assume that the user has the Docker CE installed # which doesn't require a root password. echo "" echo "This build script is using Docker container runtime to run the build in an isolated environment." echo "" - docker run --rm -it -v "$(pwd):/antora" $image $cmd + docker run --rm -it -v $(pwd):/antora $image $cmd -elif [ "$(expr substr "$(uname -s)" 1 5)" = "Linux" ]; then +elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then # Running on Linux. - # Check whether podman is available, else fall back to docker + # there isn't an antora/aarch64 container, antora can be installed locally + # Check whether podman is available, else faill back to docker # which requires root. - if [ -f /usr/bin/podman ]; then + if [ -f /usr/local/bin/antora ]; then + /usr/local/bin/antora $cmd + elif [[ `uname -m` == "aarch64" ]]; then + echo "no antora/aarch64 container try just \`npm install -g @antora/cli @antora/site-generator-default\`" + elif [ -f /usr/bin/podman ]; then echo "" echo "This build script is using Podman to run the build in an isolated environment." echo "" - podman run --rm -it -v "$(pwd):/antora:z" $image $cmd + podman run --rm -it -v $(pwd):/antora:z $image $cmd elif [ -f /usr/bin/docker ]; then echo "" @@ -29,18 +34,18 @@ elif [ "$(expr substr "$(uname -s)" 1 5)" = "Linux" ]; then echo "" if groups | grep -wq "docker"; then - docker run --rm -it -v "$(pwd):/antora:z" $image $cmd - else + docker run --rm -it -v $(pwd):/antora:z $image $cmd + else echo "" echo "This build script is using $runtime to run the build in an isolated environment. You might be asked for your password." echo "You can avoid this by adding your user to the 'docker' group, but be aware of the security implications. See https://docs.docker.com/install/linux/linux-postinstall/." echo "" - sudo docker run --rm -it -v "$(pwd):/antora:z" $image $cmd - fi + sudo docker run --rm -it -v $(pwd):/antora:z $image $cmd + fi else echo "" - echo "Error: Container runtime haven't been found on your system. Fix it by:" - echo "$ sudo dnf install podman" - exit 1 + echo "Error: Container runtime haven't been found on your system. Fix it by:" + echo "$ sudo dnf install podman" + exit 1 fi fi