From eabe1fed0a206373a14c684c69b2d456a61d7eae Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 09 2022 15:46:08 +0000 Subject: build & preview: Update with latest version from template --- diff --git a/build.sh b/build.sh index c9349e3..13ff6a1 100755 --- a/build.sh +++ b/build.sh @@ -1,16 +1,51 @@ #!/bin/sh -if [ "$(uname)" == "Darwin" ]; then +image="docker.io/antora/antora" +cmd="--html-url-extension-style=indexify site.yml" + +if uname | grep -iwq darwin; then # Running on macOS. # Let's assume that the user has the Docker CE installed # which doesn't require a root password. - docker run --rm -it -v $(pwd):/antora antora/antora --html-url-extension-style=indexify site.yml + 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}" -elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then +elif uname | grep -iq linux; then # Running on Linux. # Let's assume that it's running the Docker deamon # which requires root. - echo "" - echo "This build script is using Docker to run the build in an isolated environment. You might be asked for a root password in order to start it." -sudo docker run --rm -it -v $(pwd):/antora:z antora/antora --html-url-extension-style=indexify site.yml + + if [ -f /usr/local/bin/antora ]; then + /usr/local/bin/antora "${cmd}" + elif uname -m | grep -iwq 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}" + + elif [ -f /usr/bin/docker ]; then + echo "" + echo "This build script is using Docker to run the build in an isolated environment." + echo "" + + if groups | grep -wq "docker"; then + docker run --rm -it -v "$(pwd):/antora:z" "${image}" "${cmd}" + else + echo "You might be asked for your password." + echo "You can avoid this by adding your user to the 'docker' group," + echo "but be aware of the security implications." + echo "See https://docs.docker.com/install/linux/linux-postinstall/" + echo "" + 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 + fi fi diff --git a/preview.sh b/preview.sh index acab783..b2fb515 100755 --- a/preview.sh +++ b/preview.sh @@ -1,13 +1,17 @@ #!/bin/sh -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 "The preview will be available at http://localhost:8080/" +<<<<<<< HEAD docker run --rm -v $(pwd)/public:/usr/share/nginx/html:ro -p 8080:80 nginx +======= + docker run --rm -v "$(pwd):/antora:ro" -v "$(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro" -p 8080:80 nginx +>>>>>>> 704909f (build & preview: Update with latest version from template) -elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then +elif [ "$(expr substr "$(uname -s)" 1 5)" = "Linux" ]; then # Running on Linux. # Let's assume that it's running the Docker deamon # which requires root.