From 3c1e7130b1197294a4bf63b8d675328259b2cf91 Mon Sep 17 00:00:00 2001 From: Petr Bokoc Date: Mar 18 2022 15:25:44 +0000 Subject: Update build script & config for Antora 3.0 --- diff --git a/build.sh b/build.sh index f4ecfe4..96c2b69 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 | 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. 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 uname | grep -iq 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 | 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 + podman run --rm -it -v "$(pwd):/antora:z" "${image}" ${cmd} elif [ -f /usr/bin/docker ]; then echo "" @@ -29,13 +34,14 @@ 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 + 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 "" - 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 + sudo docker run --rm -it -v "$(pwd):/antora:z" "${image}" ${cmd} fi else echo "" diff --git a/docs/antora.yml b/docs/antora.yml index 3362281..567c2cb 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -6,7 +6,7 @@ name: commops title: CommOps # If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "master" to a specific version. -version: master +version: main # We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. start_page: ROOT:index @@ -18,4 +18,3 @@ nav: - modules/outreach-badges/nav.adoc - modules/design-assets/nav.adoc - modules/misc-docs/nav.adoc - diff --git a/site.yml b/site.yml index d810e21..4db3991 100644 --- a/site.yml +++ b/site.yml @@ -1,6 +1,6 @@ site: title: Fedora CommOps (local preview) - start_page: commops::index + start_page: commops::index.adoc content: sources: - url: . @@ -8,7 +8,7 @@ content: start_path: docs ui: bundle: - url: https://asamalik.fedorapeople.org/ui-bundle.zip + url: https://releases.pagure.org/fedora-docs/fedora-docs-ui/ui-bundle-1.04.zip snapshot: true default_layout: with_menu output: @@ -17,5 +17,5 @@ output: destinations: - provider: archive runtime: - pull: true + fetch: true cache_dir: ./cache