#293 Update build script & config for Antora 3.0
Merged 5 months ago by pbokoc. Opened 5 months ago by pbokoc.
pbokoc/fedora-commops main  into  main

file modified
+17 -11
@@ -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 @@ 

          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 ""

file modified
+1 -2
@@ -6,7 +6,7 @@ 

  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 @@ 

    - modules/outreach-badges/nav.adoc

    - modules/design-assets/nav.adoc

    - modules/misc-docs/nav.adoc

-   

file modified
+3 -3
@@ -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 @@ 

       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 @@ 

    destinations:

    - provider: archive

  runtime:

-   pull: true

+   fetch: true

    cache_dir: ./cache

no initial comment

Pull-Request has been merged by pbokoc

5 months ago