From bbcf9fbf1a5806c60f366511f6acdd832741a11f Mon Sep 17 00:00:00 2001
From: Petr Bokoc <pbokoc@redhat.com>
Date: May 04 2020 17:06:36 +0000
Subject: Update build and preview scripts to the latest version


---

diff --git a/build.sh b/build.sh
old mode 100644
new mode 100755
index c9349e3..1e4db2d
--- a/build.sh
+++ b/build.sh
@@ -1,16 +1,46 @@
 #!/bin/sh
 
+image="docker.io/antora/antora"
+cmd="--html-url-extension-style=indexify site.yml"
+
 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.
-    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
     # Running on Linux.
-    # Let's assume that it's running the Docker deamon
+    # Check whether podman is available, else faill back to docker
     # 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/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 ""
+            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
+    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
old mode 100644
new mode 100755
index acab783..acc52af
--- a/preview.sh
+++ b/preview.sh
@@ -5,14 +5,14 @@ if [ "$(uname)" == "Darwin" ]; then
     # 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/"
-    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
 
 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.
+    # Fedora Workstation has python3 installed as a default, so using that
     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."
-    echo "The preview will be available at http://localhost:8080/"
-    sudo docker run --rm -v $(pwd)/public:/usr/share/nginx/html:ro -p 8080:80 nginx
+    echo "The preview is available at http://localhost:8080"
+    echo ""
+    cd ./public
+    python3 -m http.server 8080
 fi